summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormharo <mharo@FreeBSD.org>1999-08-31 06:53:31 +0000
committermharo <mharo@FreeBSD.org>1999-08-31 06:53:31 +0000
commit89e9525cd80b9d6ce10b7181e660e1342f17214d (patch)
treef4d9e55060ca2313aa08d2352e80fe2866c3f580
parentd6c8a8d7896ae3cbf26d22acdd52fa0dfe8dc991 (diff)
downloadFreeBSD-ports-89e9525cd80b9d6ce10b7181e660e1342f17214d.zip
FreeBSD-ports-89e9525cd80b9d6ce10b7181e660e1342f17214d.tar.gz
FreeBSD.ORG -> FreeBSD.org
Prompted by PR: 13476, 13477 Submitted by: KATO Tsuguru
-rw-r--r--archivers/arc/Makefile2
-rw-r--r--archivers/bzip/Makefile2
-rw-r--r--archivers/bzip2/Makefile2
-rw-r--r--archivers/gtar/Makefile2
-rw-r--r--archivers/ha/Makefile2
-rw-r--r--archivers/hpack.non-usa.only/Makefile2
-rw-r--r--archivers/lha/Makefile2
-rw-r--r--archivers/lzo/Makefile2
-rw-r--r--archivers/lzo2/Makefile2
-rw-r--r--archivers/p5-Compress-Zlib/Makefile2
-rw-r--r--archivers/rar/Makefile2
-rw-r--r--archivers/rpm/Makefile4
-rw-r--r--archivers/star-devel/Makefile2
-rw-r--r--archivers/star/Makefile2
-rw-r--r--archivers/unarj/Makefile2
-rw-r--r--archivers/unrar/Makefile2
-rw-r--r--archivers/unzip/Makefile2
-rw-r--r--archivers/zip/Makefile2
-rw-r--r--astro/wmmoonclock/Makefile2
-rw-r--r--astro/xglobe/Makefile4
-rw-r--r--audio/amp/Makefile2
-rw-r--r--audio/esound/Makefile4
-rw-r--r--audio/gnome-audio/Makefile4
-rw-r--r--audio/gnomeaudio/Makefile4
-rw-r--r--audio/gnomeaudio2/Makefile4
-rw-r--r--audio/gqmpeg-devel/Makefile2
-rw-r--r--audio/gqmpeg/Makefile2
-rw-r--r--audio/kmpg/Makefile2
-rw-r--r--audio/libaudiofile/Makefile4
-rw-r--r--audio/libcdaudio/Makefile4
-rw-r--r--audio/libmikmod/Makefile2
-rw-r--r--audio/linux-realplayer/Makefile2
-rw-r--r--audio/mpegaudio/Makefile2
-rw-r--r--audio/nas/Makefile2
-rw-r--r--audio/nspmod/Makefile2
-rw-r--r--audio/playmidi/Makefile2
-rw-r--r--audio/replay/Makefile2
-rw-r--r--audio/speak_freely/Makefile2
-rw-r--r--audio/timidity++/Makefile2
-rw-r--r--audio/timidity/Makefile2
-rw-r--r--audio/tracker/Makefile2
-rw-r--r--audio/vat/Makefile2
-rw-r--r--audio/x11amp/Makefile4
-rw-r--r--audio/xmpeg3/Makefile2
-rw-r--r--benchmarks/lmbench/Makefile2
-rw-r--r--cad/geda/Makefile8
-rw-r--r--cad/xcircuit/Makefile2
-rw-r--r--chinese/ted/Makefile2
-rw-r--r--comms/asmodem/Makefile2
-rw-r--r--comms/bpl+/Makefile4
-rw-r--r--comms/ecu/Makefile2
-rw-r--r--comms/tkhylafax/Makefile2
-rw-r--r--comms/xcept/Makefile2
-rw-r--r--comms/yaps/Makefile2
-rw-r--r--converters/mpack/Makefile2
-rw-r--r--converters/p5-Convert-UU/Makefile2
-rw-r--r--converters/p5-MIME-Base64/Makefile2
-rw-r--r--converters/recode/Makefile4
-rw-r--r--converters/uudeview/Makefile2
-rw-r--r--converters/uulib/Makefile2
-rw-r--r--converters/xdeview/Makefile2
-rw-r--r--databases/cdb/Makefile2
-rw-r--r--databases/gadfly/Makefile4
-rw-r--r--databases/gmysql/Makefile2
-rw-r--r--databases/msql/Makefile2
-rw-r--r--databases/msql3/Makefile2
-rw-r--r--databases/namazu2/Makefile2
-rw-r--r--databases/p5-DBD-Pg-13/Makefile2
-rw-r--r--databases/p5-DBD-Pg/Makefile2
-rw-r--r--databases/p5-DBD-mysql/Makefile2
-rw-r--r--databases/p5-DBI-137/Makefile2
-rw-r--r--databases/p5-DBI/Makefile2
-rw-r--r--databases/p5-MLDBM/Makefile2
-rw-r--r--databases/p5-Msql/Makefile2
-rw-r--r--databases/p5-Mysql/Makefile2
-rw-r--r--databases/p5-Pg/Makefile2
-rw-r--r--databases/pgaccess/Makefile2
-rw-r--r--databases/postgresql-devel-server/Makefile4
-rw-r--r--databases/postgresql-devel/Makefile4
-rw-r--r--databases/postgresql7/Makefile4
-rw-r--r--databases/postgresql73-server/Makefile4
-rw-r--r--databases/postgresql73/Makefile4
-rw-r--r--databases/postgresql74-server/Makefile4
-rw-r--r--databases/postgresql80-server/Makefile4
-rw-r--r--databases/postgresql81-server/Makefile4
-rw-r--r--databases/postgresql82-server/Makefile4
-rw-r--r--databases/postgresql83-server/Makefile4
-rw-r--r--databases/postgresql84-server/Makefile4
-rw-r--r--databases/postgresql90-server/Makefile4
-rw-r--r--databases/postgresql91-server/Makefile4
-rw-r--r--databases/postgresql92-server/Makefile4
-rw-r--r--databases/py-PyGreSQL/Makefile4
-rw-r--r--databases/tkgnats/Makefile2
-rw-r--r--databases/xmbase-grok/Makefile2
-rw-r--r--databases/xmysql/Makefile2
-rw-r--r--databases/xmysqladmin/Makefile2
-rw-r--r--deskutils/gnome-pim/Makefile2
-rw-r--r--deskutils/gnomepim/Makefile2
-rw-r--r--deskutils/ical/Makefile2
-rw-r--r--deskutils/xpostit/Makefile2
-rw-r--r--devel/SWIG-devel/Makefile2
-rw-r--r--devel/SWIG/Makefile2
-rw-r--r--devel/SpecTcl/Makefile2
-rw-r--r--devel/autoconf/Makefile4
-rw-r--r--devel/autoconf213/Makefile4
-rw-r--r--devel/autoconf253/Makefile4
-rw-r--r--devel/autoconf254/Makefile4
-rw-r--r--devel/autoconf257/Makefile4
-rw-r--r--devel/autoconf259/Makefile4
-rw-r--r--devel/autoconf26/Makefile4
-rw-r--r--devel/autoconf261/Makefile4
-rw-r--r--devel/autoconf262/Makefile4
-rw-r--r--devel/autoconf267/Makefile4
-rw-r--r--devel/autoconf268/Makefile4
-rw-r--r--devel/cs/Makefile2
-rw-r--r--devel/ctags/Makefile2
-rw-r--r--devel/cvsweb/Makefile4
-rw-r--r--devel/cvsweb3/Makefile4
-rw-r--r--devel/cweb/Makefile4
-rw-r--r--devel/cxref/Makefile2
-rw-r--r--devel/dmake/Makefile2
-rw-r--r--devel/flick/Makefile2
-rw-r--r--devel/gcc-6811/Makefile2
-rw-r--r--devel/glib12/Makefile4
-rw-r--r--devel/glib13/Makefile4
-rw-r--r--devel/glib20/Makefile4
-rw-r--r--devel/gnu-autoconf/Makefile4
-rw-r--r--devel/gnustep-make/Makefile4
-rw-r--r--devel/gnustep/Makefile4
-rw-r--r--devel/id-utils/Makefile2
-rw-r--r--devel/idutils/Makefile2
-rw-r--r--devel/libdlmalloc/Makefile2
-rw-r--r--devel/libgtop/Makefile2
-rw-r--r--devel/libgtop2/Makefile2
-rw-r--r--devel/m4/Makefile2
-rw-r--r--devel/m6811-gcc/Makefile2
-rw-r--r--devel/noweb/Makefile2
-rw-r--r--devel/p5-BSD-Resource/Makefile2
-rw-r--r--devel/p5-C-Scan/Makefile2
-rw-r--r--devel/p5-Config-IniFiles/Makefile2
-rw-r--r--devel/p5-ConfigReader/Makefile2
-rw-r--r--devel/p5-Curses/Makefile2
-rw-r--r--devel/p5-Data-Flow/Makefile2
-rw-r--r--devel/p5-Data-ShowTable/Makefile2
-rw-r--r--devel/p5-Date-Manip/Makefile2
-rw-r--r--devel/p5-Devel-DProf/Makefile2
-rw-r--r--devel/p5-Devel-Peek/Makefile2
-rw-r--r--devel/p5-Devel-Symdump/Makefile2
-rw-r--r--devel/p5-Errno/Makefile4
-rw-r--r--devel/p5-File-BasicFlock/Makefile2
-rw-r--r--devel/p5-File-Lock/Makefile2
-rw-r--r--devel/p5-File-Slurp/Makefile2
-rw-r--r--devel/p5-File-Tools/Makefile2
-rw-r--r--devel/p5-Filter/Makefile4
-rw-r--r--devel/p5-FreezeThaw/Makefile2
-rw-r--r--devel/p5-IO-stringy/Makefile4
-rw-r--r--devel/p5-Include/Makefile2
-rw-r--r--devel/p5-IniConf/Makefile2
-rw-r--r--devel/p5-PV/Makefile2
-rw-r--r--devel/p5-Penguin-Easy/Makefile2
-rw-r--r--devel/p5-Penguin/Makefile2
-rw-r--r--devel/p5-Proc-Simple/Makefile4
-rw-r--r--devel/p5-Religion/Makefile2
-rw-r--r--devel/p5-Resources/Makefile2
-rw-r--r--devel/p5-Sort-Versions/Makefile4
-rw-r--r--devel/p5-Storable/Makefile2
-rw-r--r--devel/p5-Term-Query/Makefile2
-rw-r--r--devel/p5-Term-ReadKey/Makefile4
-rw-r--r--devel/p5-Time-HiRes/Makefile2
-rw-r--r--devel/p5-Time/Makefile2
-rw-r--r--devel/p5-TimeDate/Makefile2
-rw-r--r--devel/p5-TraceFuncs/Makefile4
-rw-r--r--devel/prcs/Makefile4
-rw-r--r--devel/py-kjbuckets/Makefile4
-rw-r--r--devel/py-mxDateTime/Makefile4
-rw-r--r--devel/py-mxStack/Makefile4
-rw-r--r--devel/py-mxTools/Makefile4
-rw-r--r--devel/re2c/Makefile4
-rw-r--r--devel/swig11/Makefile2
-rw-r--r--devel/swig13/Makefile2
-rw-r--r--devel/swig20/Makefile2
-rw-r--r--devel/vtcl/Makefile2
-rw-r--r--devel/xxgdb/Makefile2
-rw-r--r--dns/h2n/Makefile4
-rw-r--r--dns/hesiod/Makefile2
-rw-r--r--dns/p5-Net-DNS/Makefile2
-rw-r--r--editors/AbiWord/Makefile4
-rw-r--r--editors/AbiWord2/Makefile4
-rw-r--r--editors/abiword-devel/Makefile4
-rw-r--r--editors/abiword/Makefile4
-rw-r--r--editors/apel-emacs/Makefile4
-rw-r--r--editors/apel-emacs20/Makefile4
-rw-r--r--editors/apel-mule/Makefile4
-rw-r--r--editors/apel-xemacs/Makefile4
-rw-r--r--editors/apel-xemacs20/Makefile4
-rw-r--r--editors/apel-xemacs21-mule/Makefile4
-rw-r--r--editors/apel/Makefile4
-rw-r--r--editors/beav/Makefile4
-rw-r--r--editors/custom-emacs/Makefile2
-rw-r--r--editors/custom-mule/Makefile2
-rw-r--r--editors/e93/Makefile2
-rw-r--r--editors/emacs/Makefile2
-rw-r--r--editors/emacs19/Makefile2
-rw-r--r--editors/emacs20-dl/Makefile2
-rw-r--r--editors/emacs22/Makefile2
-rw-r--r--editors/emacs23/Makefile2
-rw-r--r--editors/flim-emacs-current/Makefile4
-rw-r--r--editors/flim-emacs/Makefile4
-rw-r--r--editors/flim-emacs20-current/Makefile4
-rw-r--r--editors/flim-emacs20/Makefile4
-rw-r--r--editors/flim-mule-current/Makefile4
-rw-r--r--editors/flim-mule/Makefile4
-rw-r--r--editors/flim-xemacs-current/Makefile4
-rw-r--r--editors/flim-xemacs/Makefile4
-rw-r--r--editors/flim-xemacs20-current/Makefile4
-rw-r--r--editors/flim-xemacs20/Makefile4
-rw-r--r--editors/flim-xemacs21-mule-current/Makefile4
-rw-r--r--editors/flim-xemacs21-mule/Makefile4
-rw-r--r--editors/flim/Makefile4
-rw-r--r--editors/flim113-emacs/Makefile4
-rw-r--r--editors/flim113-emacs20/Makefile4
-rw-r--r--editors/flim113-mule/Makefile4
-rw-r--r--editors/flim113-xemacs/Makefile4
-rw-r--r--editors/flim113-xemacs20/Makefile4
-rw-r--r--editors/flim113-xemacs21-mule/Makefile4
-rw-r--r--editors/flim113/Makefile4
-rw-r--r--editors/flim114-emacs20/Makefile4
-rw-r--r--editors/joe-devel/Makefile2
-rw-r--r--editors/joe/Makefile2
-rw-r--r--editors/joe2/Makefile2
-rw-r--r--editors/jove/Makefile2
-rw-r--r--editors/leim20/Makefile2
-rw-r--r--editors/psgml-emacs/Makefile2
-rw-r--r--editors/psgml-emacs20/Makefile2
-rw-r--r--editors/psgml-mule/Makefile2
-rw-r--r--editors/psgml-xemacs21-mule/Makefile2
-rw-r--r--editors/psgml/Makefile2
-rw-r--r--editors/semi-emacs-current/Makefile4
-rw-r--r--editors/semi-emacs/Makefile4
-rw-r--r--editors/semi-emacs20-current/Makefile4
-rw-r--r--editors/semi-emacs20/Makefile4
-rw-r--r--editors/semi-mule-current/Makefile4
-rw-r--r--editors/semi-mule/Makefile4
-rw-r--r--editors/semi-xemacs-current/Makefile4
-rw-r--r--editors/semi-xemacs/Makefile4
-rw-r--r--editors/semi-xemacs20-current/Makefile4
-rw-r--r--editors/semi-xemacs20/Makefile4
-rw-r--r--editors/semi-xemacs21-mule-current/Makefile4
-rw-r--r--editors/semi-xemacs21-mule/Makefile4
-rw-r--r--editors/semi/Makefile4
-rw-r--r--editors/semi113-emacs/Makefile4
-rw-r--r--editors/semi113-emacs20/Makefile4
-rw-r--r--editors/semi113-mule/Makefile4
-rw-r--r--editors/semi113-xemacs/Makefile4
-rw-r--r--editors/semi113-xemacs20/Makefile4
-rw-r--r--editors/semi113-xemacs21-mule/Makefile4
-rw-r--r--editors/semi113/Makefile4
-rw-r--r--editors/semi114-emacs20/Makefile4
-rw-r--r--editors/wemi-emacs-current/Makefile4
-rw-r--r--editors/wemi-emacs/Makefile4
-rw-r--r--editors/wemi-emacs20-current/Makefile2
-rw-r--r--editors/wemi-emacs20/Makefile4
-rw-r--r--editors/wemi-mule-current/Makefile4
-rw-r--r--editors/wemi-mule/Makefile4
-rw-r--r--editors/wemi-xemacs-current/Makefile4
-rw-r--r--editors/wemi-xemacs/Makefile4
-rw-r--r--editors/wemi-xemacs20-current/Makefile4
-rw-r--r--editors/wemi-xemacs20/Makefile4
-rw-r--r--editors/wemi-xemacs21-mule-current/Makefile4
-rw-r--r--editors/wemi-xemacs21-mule/Makefile4
-rw-r--r--editors/xcoral/Makefile2
-rw-r--r--emulators/bochs/Makefile2
-rw-r--r--emulators/hfsutils/Makefile2
-rw-r--r--emulators/sim/Makefile2
-rw-r--r--emulators/sim6811/Makefile2
-rw-r--r--emulators/simh/Makefile2
-rw-r--r--emulators/stella/Makefile4
-rw-r--r--emulators/wine-devel/Makefile2
-rw-r--r--emulators/wine/Makefile2
-rw-r--r--emulators/xmame/Makefile4
-rw-r--r--finance/p5-Business-CreditCard/Makefile2
-rw-r--r--ftp/axyftp/Makefile2
-rw-r--r--ftp/curl/Makefile2
-rw-r--r--ftp/gtm/Makefile4
-rw-r--r--ftp/llnlxdir/Makefile4
-rw-r--r--ftp/llnlxftp/Makefile4
-rw-r--r--ftp/mirror/Makefile2
-rw-r--r--ftp/moxftp/Makefile2
-rw-r--r--ftp/ncftp2/Makefile2
-rw-r--r--ftp/ncftp3/Makefile2
-rw-r--r--ftp/spegla/Makefile2
-rw-r--r--ftp/wget-devel/Makefile4
-rw-r--r--ftp/wget/Makefile4
-rw-r--r--games/awele/Makefile4
-rw-r--r--games/crossfire-client/Makefile2
-rw-r--r--games/crossfire-server/Makefile2
-rw-r--r--games/crossfire/Makefile2
-rw-r--r--games/fkiss/Makefile2
-rw-r--r--games/gnuchess/Makefile2
-rw-r--r--games/nethack-qt/Makefile2
-rw-r--r--games/nethack/Makefile2
-rw-r--r--games/nethack3-tty/Makefile2
-rw-r--r--games/nethack3/Makefile2
-rw-r--r--games/nethack32/Makefile2
-rw-r--r--games/nethack33-nox11/Makefile2
-rw-r--r--games/nethack33-qt/Makefile2
-rw-r--r--games/nethack33/Makefile2
-rw-r--r--games/nethack34-nox11/Makefile2
-rw-r--r--games/nethack34-qt/Makefile2
-rw-r--r--games/nethack34/Makefile2
-rw-r--r--games/netrek-BRMH-bin/Makefile4
-rw-r--r--games/netrek-COW3-bin/Makefile4
-rw-r--r--games/pysol/Makefile4
-rw-r--r--games/qcc/Makefile2
-rw-r--r--games/quakeserver/Makefile2
-rw-r--r--games/rocksndiamonds/Makefile4
-rw-r--r--games/seahaven/Makefile2
-rw-r--r--games/spider/Makefile2
-rw-r--r--games/tank/Makefile4
-rw-r--r--games/tksol/Makefile4
-rw-r--r--games/uox3/Makefile4
-rw-r--r--games/wmtimebomb/Makefile4
-rw-r--r--games/xbill/Makefile2
-rw-r--r--games/xblast/Makefile2
-rw-r--r--games/xbomb/Makefile4
-rw-r--r--games/xchadance/Makefile6
-rw-r--r--games/xdemineur/Makefile4
-rw-r--r--games/xemeraldia/Makefile2
-rw-r--r--games/xflame/Makefile2
-rw-r--r--games/xgalaga/Makefile2
-rw-r--r--games/xhime/Makefile2
-rw-r--r--games/xjig/Makefile2
-rw-r--r--games/xlife/Makefile2
-rw-r--r--games/xminehunter/Makefile4
-rw-r--r--games/xneko/Makefile2
-rw-r--r--games/xosmulti/Makefile2
-rw-r--r--games/xroach/Makefile2
-rw-r--r--games/xscrabble/Makefile2
-rw-r--r--games/xsok/Makefile4
-rw-r--r--games/xspringies/Makefile2
-rw-r--r--games/xtic/Makefile2
-rw-r--r--graphics/Mesa3/Makefile2
-rw-r--r--graphics/cqcam/Makefile2
-rw-r--r--graphics/fbm/Makefile2
-rw-r--r--graphics/fnlib/Makefile2
-rw-r--r--graphics/giflib/Makefile4
-rw-r--r--graphics/gqview/Makefile2
-rw-r--r--graphics/graphviz/Makefile4
-rw-r--r--graphics/gtkfig/Makefile2
-rw-r--r--graphics/gtksee/Makefile2
-rw-r--r--graphics/imlib/Makefile2
-rw-r--r--graphics/imlib2-tmp/Makefile2
-rw-r--r--graphics/imlib2/Makefile2
-rw-r--r--graphics/libungif/Makefile4
-rw-r--r--graphics/mesagl/Makefile2
-rw-r--r--graphics/mpeg-lib/Makefile2
-rw-r--r--graphics/mpeg_play/Makefile2
-rw-r--r--graphics/netpbm/Makefile2
-rw-r--r--graphics/netshow/Makefile4
-rw-r--r--graphics/p5-Chart/Makefile2
-rw-r--r--graphics/p5-GD/Makefile4
-rw-r--r--graphics/p5-GD1/Makefile4
-rw-r--r--graphics/p5-GD2/Makefile4
-rw-r--r--graphics/p5-Image-Size/Makefile2
-rw-r--r--graphics/p5-chart/Makefile2
-rw-r--r--graphics/plotutils/Makefile2
-rw-r--r--graphics/povray/Makefile2
-rw-r--r--graphics/povray36/Makefile2
-rw-r--r--graphics/povray37/Makefile2
-rw-r--r--graphics/pstoedit/Makefile4
-rw-r--r--graphics/qcread/Makefile2
-rw-r--r--graphics/rayshade/Makefile2
-rw-r--r--graphics/sced/Makefile2
-rw-r--r--graphics/skencil/Makefile4
-rw-r--r--graphics/sketch/Makefile4
-rw-r--r--graphics/xanim/Makefile2
-rw-r--r--graphics/xdl/Makefile2
-rw-r--r--graphics/xfig-devel/Makefile2
-rw-r--r--graphics/xfig/Makefile2
-rw-r--r--graphics/xfpovray/Makefile4
-rw-r--r--graphics/xfractint/Makefile2
-rw-r--r--graphics/xgrasp/Makefile2
-rw-r--r--graphics/xli/Makefile2
-rw-r--r--graphics/xmagv/Makefile2
-rw-r--r--graphics/xpx/Makefile2
-rw-r--r--graphics/xv-m17n/Makefile2
-rw-r--r--graphics/xv/Makefile2
-rw-r--r--irc/irc/Makefile2
-rw-r--r--irc/ircII/Makefile2
-rw-r--r--japanese/Canna/Makefile2
-rw-r--r--japanese/canna-lib/Makefile2
-rw-r--r--japanese/canna-server/Makefile2
-rw-r--r--japanese/cdrom2/Makefile4
-rw-r--r--japanese/chasen/Makefile2
-rw-r--r--japanese/chimera/Makefile2
-rw-r--r--japanese/dvi2tty/Makefile4
-rw-r--r--japanese/emacs20-dl-canna/Makefile2
-rw-r--r--japanese/emacs20-dl-wnn6/Makefile2
-rw-r--r--japanese/exmh2/Makefile2
-rw-r--r--japanese/gawk/Makefile2
-rw-r--r--japanese/gicq/Makefile2
-rw-r--r--japanese/grep/Makefile2
-rw-r--r--japanese/gxditview/Makefile2
-rw-r--r--japanese/ircII/Makefile2
-rw-r--r--japanese/jls/Makefile2
-rw-r--r--japanese/kakasi/Makefile4
-rw-r--r--japanese/kon2-16dot/Makefile2
-rw-r--r--japanese/kterm/Makefile2
-rw-r--r--japanese/libicq/Makefile2
-rw-r--r--japanese/lynx-current/Makefile4
-rw-r--r--japanese/lynx/Makefile4
-rw-r--r--japanese/lyx/Makefile2
-rw-r--r--japanese/man/Makefile2
-rw-r--r--japanese/mhonarc/Makefile2
-rw-r--r--japanese/micq/Makefile2
-rw-r--r--japanese/mimekit/Makefile4
-rw-r--r--japanese/mnews-gnspool/Makefile2
-rw-r--r--japanese/mnews/Makefile2
-rw-r--r--japanese/namazu/Makefile2
-rw-r--r--japanese/namazu2/Makefile2
-rw-r--r--japanese/nethack/Makefile2
-rw-r--r--japanese/nethack32/Makefile2
-rw-r--r--japanese/nethack34/Makefile2
-rw-r--r--japanese/netscape3.language/Makefile4
-rw-r--r--japanese/netscape4-communicator/Makefile4
-rw-r--r--japanese/netscape4-navigator/Makefile4
-rw-r--r--japanese/netscape47-communicator/Makefile2
-rw-r--r--japanese/netscape47-navigator/Makefile4
-rw-r--r--japanese/netscape48-communicator/Makefile4
-rw-r--r--japanese/nkf/Makefile2
-rw-r--r--japanese/okphone/Makefile2
-rw-r--r--japanese/paledit/Makefile2
-rw-r--r--japanese/perl5/Makefile2
-rw-r--r--japanese/pine/Makefile2
-rw-r--r--japanese/platex-common/Makefile4
-rw-r--r--japanese/platex-euc/Makefile4
-rw-r--r--japanese/platex-jis/Makefile4
-rw-r--r--japanese/platex-sjis/Makefile4
-rw-r--r--japanese/ppxp/Makefile4
-rw-r--r--japanese/ptex-base/Makefile2
-rw-r--r--japanese/ptex-common/Makefile2
-rw-r--r--japanese/ptex-euc/Makefile2
-rw-r--r--japanese/ptex-jis/Makefile2
-rw-r--r--japanese/ptex-sjis/Makefile2
-rw-r--r--japanese/ptex/Makefile2
-rw-r--r--japanese/qkc/Makefile4
-rw-r--r--japanese/sed/Makefile2
-rw-r--r--japanese/tcsh-nls-asuka/Makefile4
-rw-r--r--japanese/tcsh-nls-ayanami/Makefile4
-rw-r--r--japanese/tcsh-nls-generic/Makefile4
-rw-r--r--japanese/tcsh-nls-koshiki/Makefile4
-rw-r--r--japanese/tcsh-nls-merril/Makefile4
-rw-r--r--japanese/tcsh-nls-miyakonjo/Makefile4
-rw-r--r--japanese/tcsh-nls-multi/Makefile4
-rw-r--r--japanese/tcsh-nls-rishu/Makefile4
-rw-r--r--japanese/tcsh-nls-roomi/Makefile4
-rw-r--r--japanese/tcsh-nls-ruri2/Makefile4
-rw-r--r--japanese/tcsh/Makefile4
-rw-r--r--japanese/tvi/Makefile4
-rw-r--r--japanese/xjman-3/Makefile6
-rw-r--r--japanese/xjman/Makefile6
-rw-r--r--japanese/xv/Makefile2
-rw-r--r--java/jfc/Makefile4
-rw-r--r--lang/STk/Makefile2
-rw-r--r--lang/TenDRA/Makefile2
-rw-r--r--lang/cim/Makefile2
-rw-r--r--lang/eiffel/Makefile2
-rw-r--r--lang/elk/Makefile2
-rw-r--r--lang/gawk/Makefile2
-rw-r--r--lang/gnustep-base/Makefile4
-rw-r--r--lang/gnustep-guile/Makefile4
-rw-r--r--lang/gnustep-objc/Makefile4
-rw-r--r--lang/icon/Makefile4
-rw-r--r--lang/logo/Makefile2
-rw-r--r--lang/m3gdb/Makefile2
-rw-r--r--lang/mawk/Makefile2
-rw-r--r--lang/mit-scheme/Makefile4
-rw-r--r--lang/p5-Tcl/Makefile2
-rw-r--r--lang/perl5.10/Makefile2
-rw-r--r--lang/perl5.12/Makefile2
-rw-r--r--lang/perl5.14/Makefile2
-rw-r--r--lang/perl5.16/Makefile2
-rw-r--r--lang/perl5.6/Makefile2
-rw-r--r--lang/perl5.8/Makefile2
-rw-r--r--lang/perl5/Makefile2
-rw-r--r--lang/python+ipv6/Makefile2
-rw-r--r--lang/python-devel/Makefile2
-rw-r--r--lang/python-doc-html/Makefile4
-rw-r--r--lang/python-doc-pdf-a4/Makefile2
-rw-r--r--lang/python-doc-pdf-letter/Makefile2
-rw-r--r--lang/python-doc-postscript-a4/Makefile2
-rw-r--r--lang/python-doc-postscript-letter/Makefile2
-rw-r--r--lang/python/Makefile2
-rw-r--r--lang/python15/Makefile2
-rw-r--r--lang/python20/Makefile2
-rw-r--r--lang/python21/Makefile2
-rw-r--r--lang/python22/Makefile2
-rw-r--r--lang/python23/Makefile2
-rw-r--r--lang/python24/Makefile2
-rw-r--r--lang/python25/Makefile2
-rw-r--r--lang/python26/Makefile2
-rw-r--r--lang/python27/Makefile2
-rw-r--r--lang/python30/Makefile2
-rw-r--r--lang/python31/Makefile2
-rw-r--r--lang/python32/Makefile2
-rw-r--r--lang/rexx-imc/Makefile2
-rw-r--r--lang/scheme48/Makefile2
-rw-r--r--lang/schemetoc/Makefile2
-rw-r--r--lang/siod/Makefile2
-rw-r--r--lang/smalltalk/Makefile2
-rw-r--r--lang/swi-pl/Makefile2
-rw-r--r--lang/tcl81-thread/Makefile2
-rw-r--r--lang/tcl82/Makefile2
-rw-r--r--lang/tcl83/Makefile2
-rw-r--r--lang/tcl84/Makefile2
-rw-r--r--lang/tclX/Makefile2
-rw-r--r--lang/tclX80/Makefile2
-rw-r--r--lang/tclX82/Makefile2
-rw-r--r--lang/tclplugin/Makefile2
-rw-r--r--mail/balsa/Makefile2
-rw-r--r--mail/balsa2/Makefile2
-rw-r--r--mail/cucipop/Makefile2
-rw-r--r--mail/cyrus-imapd/Makefile4
-rw-r--r--mail/cyrus-imapd2/Makefile4
-rw-r--r--mail/cyrus-imapd22/Makefile4
-rw-r--r--mail/cyrus-imapd23/Makefile4
-rw-r--r--mail/cyrus-imapd24/Makefile4
-rw-r--r--mail/cyrus/Makefile4
-rw-r--r--mail/distribute/Makefile2
-rw-r--r--mail/elm+ME/Makefile2
-rw-r--r--mail/elm/Makefile2
-rw-r--r--mail/exim-devel/Makefile2
-rw-r--r--mail/exim-old/Makefile2
-rw-r--r--mail/exim/Makefile2
-rw-r--r--mail/faces/Makefile2
-rw-r--r--mail/kbiff/Makefile2
-rw-r--r--mail/mailagent/Makefile4
-rw-r--r--mail/mailx/Makefile2
-rw-r--r--mail/majorcool/Makefile2
-rw-r--r--mail/majordomo/Makefile4
-rw-r--r--mail/metamail/Makefile2
-rw-r--r--mail/mh/Makefile2
-rw-r--r--mail/movemail/Makefile2
-rw-r--r--mail/p5-MIME-Tools/Makefile4
-rw-r--r--mail/p5-Mail-Folder/Makefile2
-rw-r--r--mail/p5-Mail-POP3Client/Makefile2
-rw-r--r--mail/p5-Mail-Tools/Makefile2
-rw-r--r--mail/pgpsendmail/Makefile2
-rw-r--r--mail/postfix-current/Makefile2
-rw-r--r--mail/postfix/Makefile2
-rw-r--r--mail/postfix1/Makefile2
-rw-r--r--mail/postfix20/Makefile2
-rw-r--r--mail/postfix21/Makefile2
-rw-r--r--mail/postfix22/Makefile2
-rw-r--r--mail/postfix23/Makefile2
-rw-r--r--mail/postfix24/Makefile2
-rw-r--r--mail/postfix25/Makefile2
-rw-r--r--mail/postfix26/Makefile2
-rw-r--r--mail/postfix27/Makefile2
-rw-r--r--mail/postfix28/Makefile2
-rw-r--r--mail/premail/Makefile2
-rw-r--r--mail/procmail/Makefile2
-rw-r--r--mail/smail/Makefile2
-rw-r--r--mail/xfaces/Makefile2
-rw-r--r--mail/xmail/Makefile2
-rw-r--r--mail/youbin/Makefile4
-rw-r--r--math/hexcalc/Makefile2
-rw-r--r--math/librandlib/Makefile4
-rw-r--r--math/libranlib/Makefile4
-rw-r--r--math/numpy/Makefile4
-rw-r--r--math/octave-devel/Makefile2
-rw-r--r--math/octave/Makefile2
-rw-r--r--math/oleo/Makefile2
-rw-r--r--math/plplot/Makefile4
-rw-r--r--math/py-numeric/Makefile4
-rw-r--r--math/py-numeric17/Makefile4
-rw-r--r--math/pygist/Makefile4
-rw-r--r--math/randlib/Makefile4
-rw-r--r--math/vtk/Makefile4
-rw-r--r--math/vtk43/Makefile4
-rw-r--r--math/vtk5/Makefile4
-rw-r--r--math/xgraph/Makefile2
-rw-r--r--math/xplot/Makefile2
-rw-r--r--mbone/nte/Makefile2
-rw-r--r--mbone/rtpmon/Makefile2
-rw-r--r--mbone/rtptools/Makefile2
-rw-r--r--mbone/sdr/Makefile2
-rw-r--r--mbone/speak_freely/Makefile2
-rw-r--r--mbone/vat/Makefile2
-rw-r--r--mbone/vic/Makefile2
-rw-r--r--mbone/wb/Makefile2
-rw-r--r--misc/acron/Makefile4
-rw-r--r--misc/amanda-client/Makefile2
-rw-r--r--misc/amanda-server/Makefile2
-rw-r--r--misc/amanda/Makefile2
-rw-r--r--misc/amanda24-client/Makefile2
-rw-r--r--misc/amanda24-server/Makefile2
-rw-r--r--misc/amanda24/Makefile2
-rw-r--r--misc/amanda25-client/Makefile2
-rw-r--r--misc/amanda25-server/Makefile2
-rw-r--r--misc/amanda26-client/Makefile2
-rw-r--r--misc/amanda26-server/Makefile2
-rw-r--r--misc/amanda32-client/Makefile2
-rw-r--r--misc/amanda32-server/Makefile2
-rw-r--r--misc/astrolog/Makefile2
-rw-r--r--misc/chord/Makefile2
-rw-r--r--misc/dejagnu/Makefile2
-rw-r--r--misc/display/Makefile2
-rw-r--r--misc/git/Makefile4
-rw-r--r--misc/gnuit/Makefile4
-rw-r--r--misc/less/Makefile2
-rw-r--r--misc/mc/Makefile2
-rw-r--r--misc/p5-Array-PrintCols/Makefile2
-rw-r--r--misc/p5-Business-CreditCard/Makefile2
-rw-r--r--misc/p5-Locale-Codes/Makefile4
-rw-r--r--misc/pinfo/Makefile4
-rw-r--r--misc/rpm/Makefile4
-rw-r--r--misc/screen/Makefile2
-rw-r--r--misc/sma/Makefile4
-rw-r--r--misc/tkinfo/Makefile4
-rw-r--r--misc/wmweather/Makefile2
-rw-r--r--misc/xdelta/Makefile2
-rw-r--r--multimedia/linux-realplayer/Makefile2
-rw-r--r--multimedia/mpeg_play/Makefile2
-rw-r--r--multimedia/netshow/Makefile4
-rw-r--r--multimedia/vic/Makefile2
-rw-r--r--multimedia/xanim/Makefile2
-rw-r--r--net-im/gicq/Makefile2
-rw-r--r--net-im/gnomeicu/Makefile4
-rw-r--r--net-im/gnomeicu2/Makefile4
-rw-r--r--net-im/libicq/Makefile2
-rw-r--r--net-mgmt/irrtoolset/Makefile2
-rw-r--r--net-mgmt/mrtg/Makefile2
-rw-r--r--net-mgmt/net-snmp-devel/Makefile2
-rw-r--r--net-mgmt/net-snmp/Makefile2
-rw-r--r--net-mgmt/net-snmp4/Makefile2
-rw-r--r--net-mgmt/net-snmp53/Makefile2
-rw-r--r--net-mgmt/p5-SNMP/Makefile2
-rw-r--r--net-mgmt/p5-SNMP_Session/Makefile2
-rw-r--r--net/SSLtelnet/Makefile4
-rw-r--r--net/archie/Makefile2
-rw-r--r--net/arla/Makefile2
-rw-r--r--net/ascend-radius/Makefile2
-rw-r--r--net/bb/Makefile2
-rw-r--r--net/cap/Makefile2
-rw-r--r--net/citrix_ica/Makefile2
-rw-r--r--net/citrix_xenapp/Makefile2
-rw-r--r--net/delegate/Makefile4
-rw-r--r--net/echoping/Makefile2
-rw-r--r--net/ethereal/Makefile2
-rw-r--r--net/fspclient/Makefile2
-rw-r--r--net/gated/Makefile2
-rw-r--r--net/gicq/Makefile2
-rw-r--r--net/gnomeicu/Makefile4
-rw-r--r--net/gnomeicu/gnomeicu/Makefile4
-rw-r--r--net/gnomeicu2/Makefile4
-rw-r--r--net/h2n/Makefile4
-rw-r--r--net/hesiod/Makefile2
-rw-r--r--net/irrtoolset/Makefile2
-rw-r--r--net/ldapsdk/Makefile2
-rw-r--r--net/libicq/Makefile2
-rw-r--r--net/mrtg/Makefile2
-rw-r--r--net/net-snmp/Makefile2
-rw-r--r--net/net-snmp4/Makefile2
-rw-r--r--net/ntp-devel/Makefile2
-rw-r--r--net/ntp-stable/Makefile2
-rw-r--r--net/ntp/Makefile2
-rw-r--r--net/p5-Archie/Makefile2
-rw-r--r--net/p5-Net-DNS/Makefile2
-rw-r--r--net/p5-Net-Whois/Makefile2
-rw-r--r--net/p5-Net/Makefile2
-rw-r--r--net/p5-SNMP/Makefile2
-rw-r--r--net/p5-SNMP_Session/Makefile2
-rw-r--r--net/p5-URI/Makefile2
-rw-r--r--net/p5-pRPC/Makefile4
-rw-r--r--net/perldap/Makefile2
-rw-r--r--net/ppp-nt/Makefile4
-rw-r--r--net/pppload/Makefile2
-rw-r--r--net/radius/Makefile2
-rw-r--r--net/ratoolset/Makefile2
-rw-r--r--net/rmsg/Makefile2
-rw-r--r--net/rshell/Makefile2
-rw-r--r--net/rtptools/Makefile2
-rw-r--r--net/rwhois/Makefile2
-rw-r--r--net/rwhoisd/Makefile2
-rw-r--r--net/sdr/Makefile2
-rw-r--r--net/sharity-light/Makefile2
-rw-r--r--net/sniffit/Makefile2
-rw-r--r--net/tcptrace/Makefile2
-rw-r--r--net/telnetx/Makefile4
-rw-r--r--net/tintin++-devel/Makefile2
-rw-r--r--net/tintin++/Makefile2
-rw-r--r--net/ucd-snmp/Makefile2
-rw-r--r--net/wb/Makefile2
-rw-r--r--net/wireshark/Makefile2
-rw-r--r--net/xwhois/Makefile2
-rw-r--r--net/zebra-devel/Makefile2
-rw-r--r--net/zebra-pj/Makefile2
-rw-r--r--net/zebra/Makefile2
-rw-r--r--news/atp/Makefile4
-rw-r--r--news/aub/Makefile2
-rw-r--r--news/dejasearch/Makefile4
-rw-r--r--news/diablo/Makefile2
-rw-r--r--news/dnews/Makefile2
-rw-r--r--news/inn-current/Makefile2
-rw-r--r--news/inn-stable/Makefile2
-rw-r--r--news/inn/Makefile2
-rw-r--r--news/knews/Makefile2
-rw-r--r--news/nn/Makefile2
-rw-r--r--news/plor/Makefile2
-rw-r--r--news/rkive/Makefile4
-rw-r--r--news/slurp/Makefile2
-rw-r--r--news/trn/Makefile2
-rw-r--r--news/xmitbin/Makefile4
-rw-r--r--palm/pilot_makedoc/Makefile4
-rw-r--r--print/acroread-commfont/Makefile2
-rw-r--r--print/acroread/Makefile2
-rw-r--r--print/acroread4/Makefile2
-rw-r--r--print/acroread5-commfont/Makefile2
-rw-r--r--print/acroread5/Makefile2
-rw-r--r--print/apsfilter/Makefile4
-rw-r--r--print/apsfilter6/Makefile4
-rw-r--r--print/dvi2xx/Makefile2
-rw-r--r--print/ghostscript-afpl/Makefile2
-rw-r--r--print/ghostscript-gnu/Makefile2
-rw-r--r--print/ghostscript-gpl/Makefile2
-rw-r--r--print/ghostscript55/Makefile2
-rw-r--r--print/ghostscript6/Makefile2
-rw-r--r--print/ghostscript7/Makefile2
-rw-r--r--print/ghostscript8/Makefile2
-rw-r--r--print/gnome-print/Makefile2
-rw-r--r--print/gnomeprint/Makefile2
-rw-r--r--print/html2ps-a4/Makefile2
-rw-r--r--print/html2ps-letter/Makefile2
-rw-r--r--print/libgnomeprint/Makefile2
-rw-r--r--print/lyx-devel/Makefile2
-rw-r--r--print/lyx/Makefile2
-rw-r--r--print/lyx14/Makefile2
-rw-r--r--print/lyx15/Makefile2
-rw-r--r--print/lyx16/Makefile2
-rw-r--r--print/perlftlib/Makefile2
-rw-r--r--print/rtf2latex/Makefile2
-rw-r--r--print/xmbibtex/Makefile4
-rw-r--r--russian/X.language/Makefile2
-rw-r--r--russian/d1489/Makefile2
-rw-r--r--russian/netscape4.language/Makefile2
-rw-r--r--russian/pgp.language/Makefile2
-rw-r--r--security/bjorb/Makefile4
-rw-r--r--security/checkpassword/Makefile6
-rw-r--r--security/donkey/Makefile4
-rw-r--r--security/fakebo/Makefile4
-rw-r--r--security/gnupg/Makefile4
-rw-r--r--security/gnupg1/Makefile4
-rw-r--r--security/krb5-16/Makefile4
-rw-r--r--security/krb5-17/Makefile4
-rw-r--r--security/krb5-appl/Makefile4
-rw-r--r--security/krb5/Makefile4
-rw-r--r--security/libident/Makefile4
-rw-r--r--security/p5-Authen-Radius/Makefile2
-rw-r--r--security/p5-Crypt-DES/Makefile2
-rw-r--r--security/p5-Crypt-IDEA/Makefile2
-rw-r--r--security/p5-Digest-MD5/Makefile2
-rw-r--r--security/p5-MD5/Makefile2
-rw-r--r--security/p5-PGP/Makefile2
-rw-r--r--security/pgp/Makefile2
-rw-r--r--security/pgp5/Makefile2
-rw-r--r--security/pgp6/Makefile2
-rw-r--r--security/pidentd/Makefile2
-rw-r--r--security/rsaref/Makefile2
-rw-r--r--security/smurflog/Makefile4
-rw-r--r--security/ssh/Makefile4
-rw-r--r--security/ssh2/Makefile2
-rw-r--r--security/sudo/Makefile2
-rw-r--r--security/swatch/Makefile2
-rw-r--r--security/tcp_wrapper/Makefile2
-rw-r--r--security/xinetd/Makefile2
-rw-r--r--shells/bash/Makefile2
-rw-r--r--shells/bash2/Makefile2
-rw-r--r--shells/bash3/Makefile2
-rw-r--r--shells/esh/Makefile4
-rw-r--r--shells/tcsh/Makefile2
-rw-r--r--shells/zsh-devel/Makefile2
-rw-r--r--shells/zsh/Makefile2
-rw-r--r--sysutils/bchunk/Makefile2
-rw-r--r--sysutils/cd-write/Makefile2
-rw-r--r--sysutils/cfengine/Makefile4
-rw-r--r--sysutils/cfengine2/Makefile4
-rw-r--r--sysutils/cfengine3-legacy/Makefile4
-rw-r--r--sysutils/cfengine3/Makefile4
-rw-r--r--sysutils/comconsole/Makefile4
-rw-r--r--sysutils/copytape/Makefile2
-rw-r--r--sysutils/doconfig/Makefile4
-rw-r--r--sysutils/glload/Makefile4
-rw-r--r--sysutils/gnome-control-center/Makefile4
-rw-r--r--sysutils/gnome-control-center1/Makefile4
-rw-r--r--sysutils/gnomecontrolcenter/Makefile4
-rw-r--r--sysutils/gnomecontrolcenter2/Makefile4
-rw-r--r--sysutils/gtar/Makefile2
-rw-r--r--sysutils/less/Makefile2
-rw-r--r--sysutils/libretto-config/Makefile2
-rw-r--r--sysutils/mkisofs-devel/Makefile2
-rw-r--r--sysutils/mkisofs/Makefile2
-rw-r--r--sysutils/no-login/Makefile4
-rw-r--r--sysutils/screen/Makefile2
-rw-r--r--sysutils/star/Makefile2
-rw-r--r--sysutils/tua/Makefile2
-rw-r--r--sysutils/webmin/Makefile2
-rw-r--r--sysutils/xdu/Makefile2
-rw-r--r--sysutils/xfsm/Makefile4
-rw-r--r--sysutils/xsysstats/Makefile2
-rw-r--r--textproc/cocoon/Makefile4
-rw-r--r--textproc/docbook-241/Makefile2
-rw-r--r--textproc/docbook-300/Makefile2
-rw-r--r--textproc/docbook-310/Makefile2
-rw-r--r--textproc/docbook-sk/Makefile2
-rw-r--r--textproc/docbook-xml/Makefile2
-rw-r--r--textproc/dsssl-docbook-modular/Makefile2
-rw-r--r--textproc/dtd-catalogs/Makefile2
-rw-r--r--textproc/html/Makefile2
-rw-r--r--textproc/iso12083/Makefile2
-rw-r--r--textproc/iso8879/Makefile2
-rw-r--r--textproc/jade/Makefile2
-rw-r--r--textproc/linuxdoc/Makefile2
-rw-r--r--textproc/lotusxsl/Makefile4
-rw-r--r--textproc/nfbtrans/Makefile4
-rw-r--r--textproc/openjade/Makefile2
-rw-r--r--textproc/p5-XML-Parser/Makefile4
-rw-r--r--textproc/py-xml/Makefile4
-rw-r--r--textproc/rman/Makefile4
-rw-r--r--textproc/sgmlformat/Makefile2
-rw-r--r--textproc/sp/Makefile2
-rw-r--r--textproc/tth/Makefile4
-rw-r--r--textproc/word2x/Makefile6
-rw-r--r--textproc/xml4j/Makefile4
-rw-r--r--textproc/xt/Makefile4
-rw-r--r--textproc/yodl/Makefile4
-rw-r--r--www/arena/Makefile2
-rw-r--r--www/ashe/Makefile2
-rw-r--r--www/bsdi-netscape47-communicator/Makefile2
-rw-r--r--www/bsdi-netscape47-navigator/Makefile2
-rw-r--r--www/cgiparse/Makefile2
-rw-r--r--www/checkbot/Makefile2
-rw-r--r--www/chimera/Makefile2
-rw-r--r--www/cocoon/Makefile4
-rw-r--r--www/grail/Makefile2
-rw-r--r--www/harvest/Makefile2
-rw-r--r--www/htmlpp/Makefile4
-rw-r--r--www/http-analyze/Makefile2
-rw-r--r--www/libghttp/Makefile4
-rw-r--r--www/lynx-current/Makefile2
-rw-r--r--www/lynx/Makefile2
-rw-r--r--www/mapedit/Makefile2
-rw-r--r--www/netscape3/Makefile2
-rw-r--r--www/netscape4-communicator.us/Makefile2
-rw-r--r--www/netscape4-communicator/Makefile2
-rw-r--r--www/netscape4-navigator/Makefile2
-rw-r--r--www/netscape47-communicator/Makefile2
-rw-r--r--www/netscape47-navigator/Makefile2
-rw-r--r--www/netscape48-communicator/Makefile2
-rw-r--r--www/p5-Apache/Makefile2
-rw-r--r--www/p5-CGI-modules/Makefile2
-rw-r--r--www/p5-CGI/Makefile2
-rw-r--r--www/p5-CGI_Lite/Makefile2
-rw-r--r--www/p5-HTML-Parser/Makefile4
-rw-r--r--www/p5-HTML-QuickCheck/Makefile2
-rw-r--r--www/p5-HTML-Stream/Makefile2
-rw-r--r--www/p5-HTML/Makefile2
-rw-r--r--www/p5-HTTPD-Tools/Makefile2
-rw-r--r--www/p5-HTTPD-User-Manage/Makefile2
-rw-r--r--www/p5-ParallelUA/Makefile2
-rw-r--r--www/p5-WWW-Search/Makefile4
-rw-r--r--www/p5-libwww/Makefile2
-rw-r--r--www/py-HTMLgen/Makefile4
-rw-r--r--www/sitecopy/Makefile2
-rw-r--r--www/snarf/Makefile4
-rw-r--r--www/transproxy/Makefile2
-rw-r--r--www/wcol/Makefile2
-rw-r--r--www/webcopy/Makefile2
-rw-r--r--www/weblint/Makefile2
-rw-r--r--www/wwwstat/Makefile2
-rw-r--r--x11-clocks/asclock-gtk/Makefile4
-rw-r--r--x11-clocks/asclock-xlib/Makefile4
-rw-r--r--x11-clocks/astime/Makefile2
-rw-r--r--x11-clocks/bclock/Makefile2
-rw-r--r--x11-clocks/dclock/Makefile2
-rw-r--r--x11-clocks/wmcalclock/Makefile4
-rw-r--r--x11-clocks/xdaliclock/Makefile2
-rw-r--r--x11-fm/filerunner/Makefile2
-rw-r--r--x11-fm/xfm/Makefile2
-rw-r--r--x11-fonts/sharefonts/Makefile4
-rw-r--r--x11-fonts/ttmkfdir/Makefile4
-rw-r--r--x11-fonts/xfed/Makefile2
-rw-r--r--x11-fonts/xmbdfed/Makefile2
-rw-r--r--x11-servers/XFree86-4-Server-snap/Makefile2
-rw-r--r--x11-servers/XFree86-4-Server/Makefile2
-rw-r--r--x11-themes/gtk-engines/Makefile4
-rw-r--r--x11-themes/gtk-engines2/Makefile4
-rw-r--r--x11-toolkits/Xaw3d/Makefile2
-rw-r--r--x11-toolkits/gnustep-gui/Makefile4
-rw-r--r--x11-toolkits/gnustep-xgps/Makefile4
-rw-r--r--x11-toolkits/gtk-engines/Makefile4
-rw-r--r--x11-toolkits/gtk-engines2/Makefile4
-rw-r--r--x11-toolkits/gtk12/Makefile2
-rw-r--r--x11-toolkits/gtk13/Makefile2
-rw-r--r--x11-toolkits/gtk20/Makefile2
-rw-r--r--x11-toolkits/gtk30/Makefile2
-rw-r--r--x11-toolkits/neXtaw/Makefile4
-rw-r--r--x11-toolkits/p5-Gtk/Makefile2
-rw-r--r--x11-toolkits/p5-Tcl-Tk/Makefile2
-rw-r--r--x11-toolkits/p5-TclTk/Makefile2
-rw-r--r--x11-toolkits/p5-Tk/Makefile2
-rw-r--r--x11-toolkits/pmw/Makefile4
-rw-r--r--x11-toolkits/py-Pmw/Makefile4
-rw-r--r--x11-toolkits/py-gnome/Makefile4
-rw-r--r--x11-toolkits/py-gnome2/Makefile4
-rw-r--r--x11-toolkits/py-gtk/Makefile4
-rw-r--r--x11-toolkits/py-gtk2/Makefile4
-rw-r--r--x11-toolkits/qt145/Makefile2
-rw-r--r--x11-toolkits/tix/Makefile2
-rw-r--r--x11-toolkits/tk82/Makefile2
-rw-r--r--x11-toolkits/tk83/Makefile2
-rw-r--r--x11-toolkits/tk84/Makefile2
-rw-r--r--x11-toolkits/tkstep80/Makefile4
-rw-r--r--x11-toolkits/v/Makefile4
-rw-r--r--x11-toolkits/xbae/Makefile2
-rw-r--r--x11-toolkits/xview-clients/Makefile2
-rw-r--r--x11-toolkits/xview/Makefile2
-rw-r--r--x11-wm/afterstep-i18n/Makefile4
-rw-r--r--x11-wm/afterstep/Makefile4
-rw-r--r--x11-wm/ctwm/Makefile2
-rw-r--r--x11-wm/e16/Makefile2
-rw-r--r--x11-wm/enlightenment-devel/Makefile2
-rw-r--r--x11-wm/enlightenment/Makefile2
-rw-r--r--x11-wm/fvwm95/Makefile2
-rw-r--r--x11-wm/gwm/Makefile2
-rw-r--r--x11-wm/piewm/Makefile2
-rw-r--r--x11-wm/tvtwm/Makefile2
-rw-r--r--x11/XFree86-4-clients/Makefile2
-rw-r--r--x11/XFree86-4-libraries/Makefile2
-rw-r--r--x11/XFree86-4/Makefile2
-rw-r--r--x11/XFree86-contrib/Makefile2
-rw-r--r--x11/XFree86/Makefile2
-rw-r--r--x11/fbsd-icons/Makefile2
-rw-r--r--x11/kb2mb2/Makefile2
-rw-r--r--x11/wdm/Makefile4
-rw-r--r--x11/xbanner/Makefile2
-rw-r--r--x11/xcolors/Makefile2
-rw-r--r--x11/xdtm/Makefile2
-rw-r--r--x11/xfedor/Makefile2
-rw-r--r--x11/xlockmore/Makefile2
-rw-r--r--x11/xscreensaver/Makefile2
-rw-r--r--x11/xtattr/Makefile2
-rw-r--r--x11/xwit/Makefile4
953 files changed, 1275 insertions, 1275 deletions
diff --git a/archivers/arc/Makefile b/archivers/arc/Makefile
index d1d30e8..89941ff 100644
--- a/archivers/arc/Makefile
+++ b/archivers/arc/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= archivers
MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/arcers/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
NO_WRKSUBDIR= yes
MAN1= arc.1
diff --git a/archivers/bzip/Makefile b/archivers/bzip/Makefile
index 536736e..78d2ae9 100644
--- a/archivers/bzip/Makefile
+++ b/archivers/bzip/Makefile
@@ -10,7 +10,7 @@ DISTNAME= bzip-0.21
CATEGORIES= archivers
MASTER_SITES= ftp://ftp.connectnet.com/pub/bzip/bzip-0.21/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
NO_CDROM= "Restrictive copyright (don't sell for profit)"
MAN1= bzip.1 bunzip.1
diff --git a/archivers/bzip2/Makefile b/archivers/bzip2/Makefile
index 4ee5fe9..92a1d59 100644
--- a/archivers/bzip2/Makefile
+++ b/archivers/bzip2/Makefile
@@ -2,7 +2,7 @@
# New ports collection makefile for: bzip2
# Version required: 0.9.0c
# Date created: 19 Nov 1997
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index 7fd2453..81194ff 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= tar
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
GNU_CONFIGURE= yes
CONFIGURE_ARGS=--program-prefix=g
diff --git a/archivers/ha/Makefile b/archivers/ha/Makefile
index 6e88203..0c384cb 100644
--- a/archivers/ha/Makefile
+++ b/archivers/ha/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= archivers
MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/arcers/
EXTRACT_SUFX= .tgz
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
NO_WRKSUBDIR= yes
MAKEFILE= makefile.nix
diff --git a/archivers/hpack.non-usa.only/Makefile b/archivers/hpack.non-usa.only/Makefile
index b1125b2..492f62a 100644
--- a/archivers/hpack.non-usa.only/Makefile
+++ b/archivers/hpack.non-usa.only/Makefile
@@ -11,7 +11,7 @@ PKGNAME= hpack-0.79a
CATEGORIES= archivers
MASTER_SITES= ftp://src.doc.ic.ac.uk/packages/hpack/
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
RESTRICTED= "Using this code inside USA will violate RSA copyright"
NO_WRKSUBDIR= yes
diff --git a/archivers/lha/Makefile b/archivers/lha/Makefile
index 0e4d9e0..3a0fac5 100644
--- a/archivers/lha/Makefile
+++ b/archivers/lha/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.cs.titech.ac.jp/pub/tool/lha/ \
ftp://ftp.hipecs.hokudai.ac.jp/pub/unix/lha/ \
ftp://ftp.win.or.jp/pub/misc/
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
MAN1= lha.1
MANLANG= ja
diff --git a/archivers/lzo/Makefile b/archivers/lzo/Makefile
index 0800946..0d6a1ae 100644
--- a/archivers/lzo/Makefile
+++ b/archivers/lzo/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.uni-koeln.de/util/arc/ \
${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR=libs/compression
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
USE_LIBTOOL= yes
CONFIGURE_ARGS+= --enable-shared=yes \
diff --git a/archivers/lzo2/Makefile b/archivers/lzo2/Makefile
index 0800946..0d6a1ae 100644
--- a/archivers/lzo2/Makefile
+++ b/archivers/lzo2/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.uni-koeln.de/util/arc/ \
${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR=libs/compression
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
USE_LIBTOOL= yes
CONFIGURE_ARGS+= --enable-shared=yes \
diff --git a/archivers/p5-Compress-Zlib/Makefile b/archivers/p5-Compress-Zlib/Makefile
index cae04fd..fd33f62 100644
--- a/archivers/p5-Compress-Zlib/Makefile
+++ b/archivers/p5-Compress-Zlib/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= archivers perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Compress
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index 2e20994..77a8ae9 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.rarsoft.com/pub/rar/ \
ftp://ftp.cdrom.com/pub/sac/pack/
EXTRACT_SUFX= .sfx
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
CAT1= rar.1
diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile
index fde9de6..0b47268 100644
--- a/archivers/rpm/Makefile
+++ b/archivers/rpm/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: rpm
# Version required: 2.5.5
# Date created: 30 April 1999
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= rpm-2.5.5
CATEGORIES= misc
MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-2.5.x/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
diff --git a/archivers/star-devel/Makefile b/archivers/star-devel/Makefile
index 8019440..177d390 100644
--- a/archivers/star-devel/Makefile
+++ b/archivers/star-devel/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.fokus.gmd.de/pub/unix/star/ \
${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= utils/compress
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
USE_GMAKE= yes
MAKE_ENV= MAKEPROG=gmake CCOM=${CC}
diff --git a/archivers/star/Makefile b/archivers/star/Makefile
index 8019440..177d390 100644
--- a/archivers/star/Makefile
+++ b/archivers/star/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.fokus.gmd.de/pub/unix/star/ \
${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= utils/compress
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
USE_GMAKE= yes
MAKE_ENV= MAKEPROG=gmake CCOM=${CC}
diff --git a/archivers/unarj/Makefile b/archivers/unarj/Makefile
index 612bd58..ee2b7ce 100644
--- a/archivers/unarj/Makefile
+++ b/archivers/unarj/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= archivers
MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/arcers/
EXTRACT_SUFX= .tgz
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
do-install:
${INSTALL} -d -m 755 -o $(SHAREOWN) -g ${SHAREGRP} \
diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile
index 28690ef..ee4fad5 100644
--- a/archivers/unrar/Makefile
+++ b/archivers/unrar/Makefile
@@ -11,7 +11,7 @@ DISTNAME= unrar-2.50
CATEGORIES= archivers
MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/arcers/
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
NO_WRKSUBDIR= Yes
diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile
index 985e056..6f9c93b 100644
--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@@ -11,7 +11,7 @@ PKGNAME= unzip-5.40
CATEGORIES= archivers
MASTER_SITES= ftp://ftp.cdrom.com/pub/infozip/src/
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
Y2K= http://www.cdrom.com/pub/infozip/FAQ.html#Y2K
diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
index afe2f73..4322ad0 100644
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -11,7 +11,7 @@ PKGNAME= zip-2.2
CATEGORIES= archivers
MASTER_SITES= ftp://ftp.cdrom.com/pub/infozip/src/
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
Y2K= http://www.cdrom.com/pub/infozip/FAQ.html#Y2K
diff --git a/astro/wmmoonclock/Makefile b/astro/wmmoonclock/Makefile
index f3a0be8..dfd388b 100644
--- a/astro/wmmoonclock/Makefile
+++ b/astro/wmmoonclock/Makefile
@@ -10,7 +10,7 @@ DISTNAME= wmMoonClock-1.26
CATEGORIES= astro windowmaker
MASTER_SITES= http://nis-www.lanl.gov/~mgh/WindowMaker/
-MAINTAINER= kris@FreeBSD.ORG
+MAINTAINER= kris@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm/
diff --git a/astro/xglobe/Makefile b/astro/xglobe/Makefile
index 3ca6048..7adce74 100644
--- a/astro/xglobe/Makefile
+++ b/astro/xglobe/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: xglobe
# Version required: 0.3.1
# Date created: 20 January 1998
-# Whom: Kris Kennaway <kris@FreeBSD.ORG>
+# Whom: Kris Kennaway <kris@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= xglobe-0.3.1
CATEGORIES= astro
MASTER_SITES= http://www.uni-karlsruhe.de/~uddn/xglobe/
-MAINTAINER= kris@FreeBSD.ORG
+MAINTAINER= kris@FreeBSD.org
USE_QT= yes
USE_X_PREFIX= yes
diff --git a/audio/amp/Makefile b/audio/amp/Makefile
index 10ab9a2..492213e 100644
--- a/audio/amp/Makefile
+++ b/audio/amp/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= audio
# the author's site seems dead.
MASTER_SITES= ftp://ftp.clara.net/pub/unix/Audio/
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index 2d72925..0211a4a 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: esound
# Version required: 0.2.8
# Date created: 19 July 1998
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= gnome-1.0/sources
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile
diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile
index 802e7a8..1f5315a 100644
--- a/audio/gnome-audio/Makefile
+++ b/audio/gnome-audio/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: gnomeaudio
# Version required: 1.0.0
# Date created: 29 Dec 1998
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-audio
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
BUILD_DEPENDS= gnome-config:${PORTSDIR}/x11/gnomelibs
RUN_DEPENDS= gnome-config:${PORTSDIR}/x11/gnomelibs
diff --git a/audio/gnomeaudio/Makefile b/audio/gnomeaudio/Makefile
index 802e7a8..1f5315a 100644
--- a/audio/gnomeaudio/Makefile
+++ b/audio/gnomeaudio/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: gnomeaudio
# Version required: 1.0.0
# Date created: 29 Dec 1998
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-audio
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
BUILD_DEPENDS= gnome-config:${PORTSDIR}/x11/gnomelibs
RUN_DEPENDS= gnome-config:${PORTSDIR}/x11/gnomelibs
diff --git a/audio/gnomeaudio2/Makefile b/audio/gnomeaudio2/Makefile
index 802e7a8..1f5315a 100644
--- a/audio/gnomeaudio2/Makefile
+++ b/audio/gnomeaudio2/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: gnomeaudio
# Version required: 1.0.0
# Date created: 29 Dec 1998
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= audio gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-audio
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
BUILD_DEPENDS= gnome-config:${PORTSDIR}/x11/gnomelibs
RUN_DEPENDS= gnome-config:${PORTSDIR}/x11/gnomelibs
diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile
index 7f7b2bb..df799c3 100644
--- a/audio/gqmpeg-devel/Makefile
+++ b/audio/gqmpeg-devel/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: gqmpeg
# Version required: 0.6.3
# Date Created: 28 Oct 1998
-# Whom: Vanilla Pooh Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla Pooh Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index 7f7b2bb..df799c3 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: gqmpeg
# Version required: 0.6.3
# Date Created: 28 Oct 1998
-# Whom: Vanilla Pooh Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla Pooh Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/audio/kmpg/Makefile b/audio/kmpg/Makefile
index de09d84..c63ec9d 100644
--- a/audio/kmpg/Makefile
+++ b/audio/kmpg/Makefile
@@ -10,7 +10,7 @@ DISTNAME= kmpg-0.4.3a
CATEGORIES= audio kde
MASTER_SITES= http://www.freebsd.org/~tom/distfiles/
-MAINTAINER= tom@FreeBSD.ORG
+MAINTAINER= tom@FreeBSD.org
LIB_DEPENDS= kdecore.2:${PORTSDIR}/x11/kdelibs11 \
kdeui.2:${PORTSDIR}/x11/kdelibs11
diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile
index 71efda1..4995973 100644
--- a/audio/libaudiofile/Makefile
+++ b/audio/libaudiofile/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: libaudiofile
# Version required: 0.1.6
# Date created: 22 Dec 1998
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= gnome-1.0/sources
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
USE_LIBTOOL= yes
diff --git a/audio/libcdaudio/Makefile b/audio/libcdaudio/Makefile
index f4ca5ec..7f5667d 100644
--- a/audio/libcdaudio/Makefile
+++ b/audio/libcdaudio/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: libcdaudio
# Version required: 0.7.0
# Date created: 01 June 1999
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= audio
MASTER_SITES= ftp://ftp.debian.org/pub/debian/dists/potato/main/source/libs/
EXTRACT_SUFX= .orig.tar.gz
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
WRKSRC= ${WRKDIR}/${PKGNAME}
USE_LIBTOOL= yes
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index 1421014..147ed0b 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= audio
# The files at multimania.com seem to be corrupted
MASTER_SITES= http://mikmod.darkorb.net/libmikmod/
-MAINTAINER= mharo@FreeBSD.ORG
+MAINTAINER= mharo@FreeBSD.org
LIB_DEPENDS= esd.1:${PORTSDIR}/audio/esound
diff --git a/audio/linux-realplayer/Makefile b/audio/linux-realplayer/Makefile
index 1499348..78f5006 100644
--- a/audio/linux-realplayer/Makefile
+++ b/audio/linux-realplayer/Makefile
@@ -11,7 +11,7 @@ PKGNAME= linux-realplayer-5.0
CATEGORIES= audio
MASTER_SITES=
-MAINTAINER= kris@FreeBSD.ORG
+MAINTAINER= kris@FreeBSD.org
RUN_DEPENDS= /compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
diff --git a/audio/mpegaudio/Makefile b/audio/mpegaudio/Makefile
index 5698844..07035f4 100644
--- a/audio/mpegaudio/Makefile
+++ b/audio/mpegaudio/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= audio
MASTER_SITES= ftp://ftp.iuma.com/audio_utils/converters/source/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
MAN1= mpeg_musicin.1 mpeg_musicout.1
diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index c2263d6..e4ae9fe 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= audio/nas
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
USE_IMAKE= yes
ALL_TARGET= World
diff --git a/audio/nspmod/Makefile b/audio/nspmod/Makefile
index b1cec7e..42fa3c9 100644
--- a/audio/nspmod/Makefile
+++ b/audio/nspmod/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://www.jeton.or.jp/users/toru/www/orgsoft/nspmod/ \
${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/sound/players
-MAINTAINER= jmg@FreeBSD.ORG
+MAINTAINER= jmg@FreeBSD.org
MAN1= nspmod.1
diff --git a/audio/playmidi/Makefile b/audio/playmidi/Makefile
index 9a5a7ae..834ccc4 100644
--- a/audio/playmidi/Makefile
+++ b/audio/playmidi/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/sound/players
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
IS_INTERACTIVE= YES # asks what devices you want to support
HAS_CONFIGURE= YES
diff --git a/audio/replay/Makefile b/audio/replay/Makefile
index 74c5f56..411a0e4 100644
--- a/audio/replay/Makefile
+++ b/audio/replay/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: replay
# Version required: 0.61
# Date created: Oct 27 1998
-# Whom: Vanilla Pooh Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla Pooh Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/audio/speak_freely/Makefile b/audio/speak_freely/Makefile
index 7ba6bf6..232c556 100644
--- a/audio/speak_freely/Makefile
+++ b/audio/speak_freely/Makefile
@@ -11,7 +11,7 @@ DISTNAME= speak_freely-6.1c
CATEGORIES= mbone audio security
MASTER_SITES= http://www.fourmilab.ch/speakfree/unix/prior-releases/6.1/
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm
diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
index 3b51489..3abfe38 100644
--- a/audio/timidity++/Makefile
+++ b/audio/timidity++/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.kiarchive.ru/pub/misc/hardware/soundcard/gus/ \
TIINS= goemon.tgz
DISTFILES= ${TIINS} ${DISTNAME}.tar.gz
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
NO_CDROM= "Uses copyrighted patches"
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index 3b51489..3abfe38 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.kiarchive.ru/pub/misc/hardware/soundcard/gus/ \
TIINS= goemon.tgz
DISTFILES= ${TIINS} ${DISTNAME}.tar.gz
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
NO_CDROM= "Uses copyrighted patches"
diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile
index a761c4f..d87ef11 100644
--- a/audio/tracker/Makefile
+++ b/audio/tracker/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= audio
MASTER_SITES= ftp://ftp.uni-trier.de/pub/unix/audio/tracker/
EXTRACT_SUFX= .tgz
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
RESTRICTED= "Non-redistributable beta"
diff --git a/audio/vat/Makefile b/audio/vat/Makefile
index 5315aa8..b86d3a9 100644
--- a/audio/vat/Makefile
+++ b/audio/vat/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= mbone tk80
MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vat/alpha-test/
DISTFILES= vatsrc-4.0b2.tar.gz
-MAINTAINER= fenner@FreeBSD.ORG
+MAINTAINER= fenner@FreeBSD.org
GSM_DIR= ${.CURDIR}/../../audio/gsm
GSM_WORK= ${WRKDIRPREFIX}${GSM_DIR}/work/gsm-1.0-pl10
diff --git a/audio/x11amp/Makefile b/audio/x11amp/Makefile
index 7841c81..bf2a3eb 100644
--- a/audio/x11amp/Makefile
+++ b/audio/x11amp/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: x11amp
# Version required: 0.7
# Date created: 13 Jul 1998
-# Whom: Donald Burr <dburr@FreeBSD.ORG>
+# Whom: Donald Burr <dburr@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= audio
MASTER_SITES= ftp://www.se.opensound.com/pub/oss/ossapps/
EXTRACT_SUFX= .tar.gz
-MAINTAINER= dburr@FreeBSD.ORG
+MAINTAINER= dburr@FreeBSD.org
NO_BUILD= YES
NO_FILTER_SHLIBS= YES
diff --git a/audio/xmpeg3/Makefile b/audio/xmpeg3/Makefile
index 8fedc6b..5959ea1 100644
--- a/audio/xmpeg3/Makefile
+++ b/audio/xmpeg3/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= audio tk80
MASTER_SITES= ftp://ftp.funet.fi/pub/sci/audio/mpeg/amp/
EXTRACT_SUFX= .tgz
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
RUN_DEPENDS= amp:${PORTSDIR}/audio/amp \
wish8.0:${PORTSDIR}/x11-toolkits/tk80
diff --git a/benchmarks/lmbench/Makefile b/benchmarks/lmbench/Makefile
index 7d2d93c..69c14cd 100644
--- a/benchmarks/lmbench/Makefile
+++ b/benchmarks/lmbench/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= benchmarks
MASTER_SITES= http://reality.sgi.com/lm_engr/lmbench/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= fenner@FreeBSD.ORG
+MAINTAINER= fenner@FreeBSD.org
ALL_TARGET= build
MAKE_ENV= PATH=${PATH}:${WRKSRC}/scripts
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index fe78940..24a72ae 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: geda
# Version required: 19990124
# Date created: 24 Nov 1998
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gEDA-19990327
-PKGNAME= geda-19990327
+DISTNAME= gEDA-19990516
+PKGNAME= geda-19990516
CATEGORIES= cad
MASTER_SITES= http://www.geda.seul.org/dist/ \
ftp://ftp.geda.seul.org/pub/geda/dist/ \
ftp://ftp.infodrom.north.de/pub/unix/gtk-etc/apps/geda/
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
guile.4:${PORTSDIR}/lang/guile
diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index e654df8..ccbaf70 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://bach.ece.jhu.edu/pub/tim/ \
${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR=apps/circuits
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
BROKEN='bad MD5 checksum'
diff --git a/chinese/ted/Makefile b/chinese/ted/Makefile
index f1c91ca..fe68655 100644
--- a/chinese/ted/Makefile
+++ b/chinese/ted/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://moon.csie.ntu.edu.tw/pub/X/ted/ \
ftp://freebsd.ntu.edu.tw/freebsd/ntu/moon/X/ted/
EXTRACT_SUFX= .tgz
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
RUN_DEPENDS= ${X11BASE}/bin/xcin:${PORTSDIR}/chinese/xcin
diff --git a/comms/asmodem/Makefile b/comms/asmodem/Makefile
index 11a46fd..2558ec9 100644
--- a/comms/asmodem/Makefile
+++ b/comms/asmodem/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= comms
MASTER_SITES= ftp://afterstep.foo.net/pub/AfterStep/apps/asmodem/ \
ftp://ftp.cs.tu-berlin.de/pub/X/afterstep/apps/asmodem/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/comms/bpl+/Makefile b/comms/bpl+/Makefile
index f5e3246..5305f0d 100644
--- a/comms/bpl+/Makefile
+++ b/comms/bpl+/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: bpl+
# Version required: ?
# Date created: 22 Sep 1996
-# Whom: Masafumi NAKANE <max@FreeBSD.ORG>
+# Whom: Masafumi NAKANE <max@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= bpl+-1.0
CATEGORIES= comms
MASTER_SITES= ftp://ftp.tohoku.ac.jp/pub/net/telnet/telnetx/
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bpl ${PREFIX}/bin
diff --git a/comms/ecu/Makefile b/comms/ecu/Makefile
index b95d724..173e067 100644
--- a/comms/ecu/Makefile
+++ b/comms/ecu/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= comms
MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/comm/
#MASTER_SITES= ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/Communications/
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
do-configure:
cd ${WRKSRC}; yes "" | ./Configure
diff --git a/comms/tkhylafax/Makefile b/comms/tkhylafax/Makefile
index d1ca01f..0b8a274 100644
--- a/comms/tkhylafax/Makefile
+++ b/comms/tkhylafax/Makefile
@@ -11,7 +11,7 @@ PKGNAME= tkhylafax-3.0
CATEGORIES= comms tk42
MASTER_SITES= http://www.NeoSoft.com/tcl/ftparchive/sorted/comm/tkhylafax-3.0b2/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
RUN_DEPENDS= wish4.2:${PORTSDIR}/x11-toolkits/tk42 \
sendfax:${PORTSDIR}/comms/hylafax \
diff --git a/comms/xcept/Makefile b/comms/xcept/Makefile
index 3e50335..b32fc6c 100644
--- a/comms/xcept/Makefile
+++ b/comms/xcept/Makefile
@@ -10,7 +10,7 @@ DISTNAME= xcept-2.1.2
CATEGORIES= comms
MASTER_SITES= ${MASTER_SITE_LOCAL}
-MAINTAINER= joerg@FreeBSD.ORG
+MAINTAINER= joerg@FreeBSD.org
USE_XLIB= yes
MAN1= xcept.1
diff --git a/comms/yaps/Makefile b/comms/yaps/Makefile
index 3580619..173b0f1 100644
--- a/comms/yaps/Makefile
+++ b/comms/yaps/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= comms
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/serialcomm/machines
-MAINTAINER= se@FreeBSD.ORG
+MAINTAINER= se@FreeBSD.org
USE_GMAKE= true
diff --git a/converters/mpack/Makefile b/converters/mpack/Makefile
index 4e7a7d9..25bec83 100644
--- a/converters/mpack/Makefile
+++ b/converters/mpack/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= converters mail news
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/mpack/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
WRKSRC= ${WRKDIR}/mpack
MAKEFLAGS= -f
diff --git a/converters/p5-Convert-UU/Makefile b/converters/p5-Convert-UU/Makefile
index 21f6bb7..c15a624 100644
--- a/converters/p5-Convert-UU/Makefile
+++ b/converters/p5-Convert-UU/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= converters perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Convert
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/converters/p5-MIME-Base64/Makefile b/converters/p5-MIME-Base64/Makefile
index 96e23fc..32dbb18 100644
--- a/converters/p5-MIME-Base64/Makefile
+++ b/converters/p5-MIME-Base64/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= converters perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= MIME
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
USE_PERL5= YES
diff --git a/converters/recode/Makefile b/converters/recode/Makefile
index cb00c4b..2635d5f 100644
--- a/converters/recode/Makefile
+++ b/converters/recode/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: recode
# Version required: 3.4
# Date created: 14 Jul 1995
-# Whom: torstenb@FreeBSD.ORG
+# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= converters
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= recode
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
GNU_CONFIGURE= YES
diff --git a/converters/uudeview/Makefile b/converters/uudeview/Makefile
index 0ca56e5..f08c4fb 100644
--- a/converters/uudeview/Makefile
+++ b/converters/uudeview/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= converters
MASTER_SITES= http://www.informatik.uni-frankfurt.de/~fp/uudeview/Apps/frank/ \
ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/
-MAINTAINER= hoek@FreeBSD.ORG
+MAINTAINER= hoek@FreeBSD.org
LIB_DEPENDS= uu.1:${PORTSDIR}/converters/uulib
diff --git a/converters/uulib/Makefile b/converters/uulib/Makefile
index 52308a6..0b38a40 100644
--- a/converters/uulib/Makefile
+++ b/converters/uulib/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= converters
MASTER_SITES= ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/ \
http://www.informatik.uni-frankfurt.de/~fp/uudeview/Apps/frank/
-MAINTAINER= hoek@FreeBSD.ORG
+MAINTAINER= hoek@FreeBSD.org
GNU_CONFIGURE= yes
diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile
index e61cc62..80c0008 100644
--- a/converters/xdeview/Makefile
+++ b/converters/xdeview/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= converters tk80
MASTER_SITES= ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/ \
http://www.informatik.uni-frankfurt.de/~fp/uudeview/Apps/frank/
-MAINTAINER= hoek@FreeBSD.ORG
+MAINTAINER= hoek@FreeBSD.org
LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80 \
uu.1:${PORTSDIR}/converters/uulib
diff --git a/databases/cdb/Makefile b/databases/cdb/Makefile
index a36462b..58e14f8 100644
--- a/databases/cdb/Makefile
+++ b/databases/cdb/Makefile
@@ -10,7 +10,7 @@ DISTNAME= cdb-0.55
CATEGORIES= databases
MASTER_SITES= ftp://koobera.math.uic.edu/www/software/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
ALL_TARGET= it
MAN1= cdbget.1 cdbmake.1 cdbdump.1 cdbstats.1 cdbtest.1
diff --git a/databases/gadfly/Makefile b/databases/gadfly/Makefile
index b67701e..f884851 100644
--- a/databases/gadfly/Makefile
+++ b/databases/gadfly/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: gadfly
# Version required: 1.0
# Date created: 30 October 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= gadfly-1.0
CATEGORIES= databases
MASTER_SITES= http://www.chordate.com/kwParsing/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
BUILD_DEPENDS= python:${PORTSDIR}/lang/python
RUN_DEPENDS= python:${PORTSDIR}/lang/python
diff --git a/databases/gmysql/Makefile b/databases/gmysql/Makefile
index 48aa8a6..3d7788f 100644
--- a/databases/gmysql/Makefile
+++ b/databases/gmysql/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= databases
MASTER_SITES= http://www.loth.demon.co.uk/gmysql/ \
http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
-MAINTAINER= dirk@FreeBSD.ORG
+MAINTAINER= dirk@FreeBSD.org
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
mysqlclient.6:${PORTSDIR}/databases/mysql322-client
diff --git a/databases/msql/Makefile b/databases/msql/Makefile
index e35a85a..6376f34 100644
--- a/databases/msql/Makefile
+++ b/databases/msql/Makefile
@@ -9,7 +9,7 @@
DISTNAME= msql-2.0.4.1
CATEGORIES= databases
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
# Not free for commercial use. Must create a user on the local system
NO_PACKAGE= YES
diff --git a/databases/msql3/Makefile b/databases/msql3/Makefile
index e35a85a..6376f34 100644
--- a/databases/msql3/Makefile
+++ b/databases/msql3/Makefile
@@ -9,7 +9,7 @@
DISTNAME= msql-2.0.4.1
CATEGORIES= databases
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
# Not free for commercial use. Must create a user on the local system
NO_PACKAGE= YES
diff --git a/databases/namazu2/Makefile b/databases/namazu2/Makefile
index 9cf475a..d2db2de 100644
--- a/databases/namazu2/Makefile
+++ b/databases/namazu2/Makefile
@@ -11,7 +11,7 @@ PKGNAME= ja-namazu-1.3.0.8
CATEGORIES= japanese textproc
MASTER_SITES= http://openlab.ring.gr.jp/namazu/release/
-MAINTAINER= flathill@FreeBSD.ORG
+MAINTAINER= flathill@FreeBSD.org
BUILD_DEPENDS= kakasi:${PORTSDIR}/japanese/kakasi \
nkf:${PORTSDIR}/japanese/nkf
diff --git a/databases/p5-DBD-Pg-13/Makefile b/databases/p5-DBD-Pg-13/Makefile
index 532a3b6..10ff80b 100644
--- a/databases/p5-DBD-Pg-13/Makefile
+++ b/databases/p5-DBD-Pg-13/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= DBD
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
${PREFIX}/pgsql/lib/libpq.so.2:${PORTSDIR}/databases/postgresql
diff --git a/databases/p5-DBD-Pg/Makefile b/databases/p5-DBD-Pg/Makefile
index 532a3b6..10ff80b 100644
--- a/databases/p5-DBD-Pg/Makefile
+++ b/databases/p5-DBD-Pg/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= DBD
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
${PREFIX}/pgsql/lib/libpq.so.2:${PORTSDIR}/databases/postgresql
diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile
index 3dfa673..a43fa74 100644
--- a/databases/p5-DBD-mysql/Makefile
+++ b/databases/p5-DBD-mysql/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= DBD
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Data/ShowTable.pm:${PORTSDIR}/devel/p5-Data-ShowTable \
${PREFIX}/lib/perl5/site_perl/${PERL_VER}/i386-freebsd/DBI.pm:${PORTSDIR}/databases/p5-DBI
diff --git a/databases/p5-DBI-137/Makefile b/databases/p5-DBI-137/Makefile
index 9b7e380..44bbb09 100644
--- a/databases/p5-DBI-137/Makefile
+++ b/databases/p5-DBI-137/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= DBI
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/RPC/pServer.pm:${PORTSDIR}/net/p5-pRPC
diff --git a/databases/p5-DBI/Makefile b/databases/p5-DBI/Makefile
index 9b7e380..44bbb09 100644
--- a/databases/p5-DBI/Makefile
+++ b/databases/p5-DBI/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= DBI
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/RPC/pServer.pm:${PORTSDIR}/net/p5-pRPC
diff --git a/databases/p5-MLDBM/Makefile b/databases/p5-MLDBM/Makefile
index 636bc9d..c7cc506 100644
--- a/databases/p5-MLDBM/Makefile
+++ b/databases/p5-MLDBM/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= MLDBM
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/FreezeThaw.pm:${PORTSDIR}/devel/p5-FreezeThaw \
${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
diff --git a/databases/p5-Msql/Makefile b/databases/p5-Msql/Makefile
index ac07721..8b9b4ea 100644
--- a/databases/p5-Msql/Makefile
+++ b/databases/p5-Msql/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Msql
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/libmsql.a:${PORTSDIR}/databases/msql \
${PREFIX}/lib/perl5/site_perl/Data/ShowTable.pm:${PORTSDIR}/devel/p5-Data-ShowTable \
diff --git a/databases/p5-Mysql/Makefile b/databases/p5-Mysql/Makefile
index 3dfa673..a43fa74 100644
--- a/databases/p5-Mysql/Makefile
+++ b/databases/p5-Mysql/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= DBD
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Data/ShowTable.pm:${PORTSDIR}/devel/p5-Data-ShowTable \
${PREFIX}/lib/perl5/site_perl/${PERL_VER}/i386-freebsd/DBI.pm:${PORTSDIR}/databases/p5-DBI
diff --git a/databases/p5-Pg/Makefile b/databases/p5-Pg/Makefile
index 06ed9e9..fb00d50 100644
--- a/databases/p5-Pg/Makefile
+++ b/databases/p5-Pg/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Pg
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/pgsql/lib/libpq.a:${PORTSDIR}/databases/postgresql
diff --git a/databases/pgaccess/Makefile b/databases/pgaccess/Makefile
index 3acd0c5..c66313b 100644
--- a/databases/pgaccess/Makefile
+++ b/databases/pgaccess/Makefile
@@ -10,7 +10,7 @@ DISTNAME= pgaccess-0.96
CATEGORIES= databases
MASTER_SITES= http://www.flex.ro/pgaccess/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
RUN_DEPENDS= ${PREFIX}/pgsql/bin/postmaster:${PORTSDIR}/databases/postgresql\
wish8.0:${PORTSDIR}/x11-toolkits/tk80
diff --git a/databases/postgresql-devel-server/Makefile b/databases/postgresql-devel-server/Makefile
index 1be86a4..aae3a17 100644
--- a/databases/postgresql-devel-server/Makefile
+++ b/databases/postgresql-devel-server/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: PostgreSQL
# Version required: 6.4.2
# Date created: November 13, 1998
-# Whom: Marc G. Fournier <scrappy@FreeBSD.ORG>
+# Whom: Marc G. Fournier <scrappy@FreeBSD.org>
#
# $FreeBSD$
#
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.postgresql.org/pub/ \
ftp://ftp.incoma.ru/pub/unix/postgresql/ \
ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
.if ${MACHINE_ARCH} == "alpha"
BROKEN= doesn\'t build on the alpha yet
diff --git a/databases/postgresql-devel/Makefile b/databases/postgresql-devel/Makefile
index 1be86a4..aae3a17 100644
--- a/databases/postgresql-devel/Makefile
+++ b/databases/postgresql-devel/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: PostgreSQL
# Version required: 6.4.2
# Date created: November 13, 1998
-# Whom: Marc G. Fournier <scrappy@FreeBSD.ORG>
+# Whom: Marc G. Fournier <scrappy@FreeBSD.org>
#
# $FreeBSD$
#
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.postgresql.org/pub/ \
ftp://ftp.incoma.ru/pub/unix/postgresql/ \
ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
.if ${MACHINE_ARCH} == "alpha"
BROKEN= doesn\'t build on the alpha yet
diff --git a/databases/postgresql7/Makefile b/databases/postgresql7/Makefile
index 1be86a4..aae3a17 100644
--- a/databases/postgresql7/Makefile
+++ b/databases/postgresql7/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: PostgreSQL
# Version required: 6.4.2
# Date created: November 13, 1998
-# Whom: Marc G. Fournier <scrappy@FreeBSD.ORG>
+# Whom: Marc G. Fournier <scrappy@FreeBSD.org>
#
# $FreeBSD$
#
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.postgresql.org/pub/ \
ftp://ftp.incoma.ru/pub/unix/postgresql/ \
ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
.if ${MACHINE_ARCH} == "alpha"
BROKEN= doesn\'t build on the alpha yet
diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile
index 1be86a4..aae3a17 100644
--- a/databases/postgresql73-server/Makefile
+++ b/databases/postgresql73-server/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: PostgreSQL
# Version required: 6.4.2
# Date created: November 13, 1998
-# Whom: Marc G. Fournier <scrappy@FreeBSD.ORG>
+# Whom: Marc G. Fournier <scrappy@FreeBSD.org>
#
# $FreeBSD$
#
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.postgresql.org/pub/ \
ftp://ftp.incoma.ru/pub/unix/postgresql/ \
ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
.if ${MACHINE_ARCH} == "alpha"
BROKEN= doesn\'t build on the alpha yet
diff --git a/databases/postgresql73/Makefile b/databases/postgresql73/Makefile
index 1be86a4..aae3a17 100644
--- a/databases/postgresql73/Makefile
+++ b/databases/postgresql73/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: PostgreSQL
# Version required: 6.4.2
# Date created: November 13, 1998
-# Whom: Marc G. Fournier <scrappy@FreeBSD.ORG>
+# Whom: Marc G. Fournier <scrappy@FreeBSD.org>
#
# $FreeBSD$
#
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.postgresql.org/pub/ \
ftp://ftp.incoma.ru/pub/unix/postgresql/ \
ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
.if ${MACHINE_ARCH} == "alpha"
BROKEN= doesn\'t build on the alpha yet
diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index 1be86a4..aae3a17 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-server/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: PostgreSQL
# Version required: 6.4.2
# Date created: November 13, 1998
-# Whom: Marc G. Fournier <scrappy@FreeBSD.ORG>
+# Whom: Marc G. Fournier <scrappy@FreeBSD.org>
#
# $FreeBSD$
#
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.postgresql.org/pub/ \
ftp://ftp.incoma.ru/pub/unix/postgresql/ \
ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
.if ${MACHINE_ARCH} == "alpha"
BROKEN= doesn\'t build on the alpha yet
diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile
index 1be86a4..aae3a17 100644
--- a/databases/postgresql80-server/Makefile
+++ b/databases/postgresql80-server/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: PostgreSQL
# Version required: 6.4.2
# Date created: November 13, 1998
-# Whom: Marc G. Fournier <scrappy@FreeBSD.ORG>
+# Whom: Marc G. Fournier <scrappy@FreeBSD.org>
#
# $FreeBSD$
#
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.postgresql.org/pub/ \
ftp://ftp.incoma.ru/pub/unix/postgresql/ \
ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
.if ${MACHINE_ARCH} == "alpha"
BROKEN= doesn\'t build on the alpha yet
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index 1be86a4..aae3a17 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: PostgreSQL
# Version required: 6.4.2
# Date created: November 13, 1998
-# Whom: Marc G. Fournier <scrappy@FreeBSD.ORG>
+# Whom: Marc G. Fournier <scrappy@FreeBSD.org>
#
# $FreeBSD$
#
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.postgresql.org/pub/ \
ftp://ftp.incoma.ru/pub/unix/postgresql/ \
ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
.if ${MACHINE_ARCH} == "alpha"
BROKEN= doesn\'t build on the alpha yet
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index 1be86a4..aae3a17 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: PostgreSQL
# Version required: 6.4.2
# Date created: November 13, 1998
-# Whom: Marc G. Fournier <scrappy@FreeBSD.ORG>
+# Whom: Marc G. Fournier <scrappy@FreeBSD.org>
#
# $FreeBSD$
#
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.postgresql.org/pub/ \
ftp://ftp.incoma.ru/pub/unix/postgresql/ \
ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
.if ${MACHINE_ARCH} == "alpha"
BROKEN= doesn\'t build on the alpha yet
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index 1be86a4..aae3a17 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: PostgreSQL
# Version required: 6.4.2
# Date created: November 13, 1998
-# Whom: Marc G. Fournier <scrappy@FreeBSD.ORG>
+# Whom: Marc G. Fournier <scrappy@FreeBSD.org>
#
# $FreeBSD$
#
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.postgresql.org/pub/ \
ftp://ftp.incoma.ru/pub/unix/postgresql/ \
ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
.if ${MACHINE_ARCH} == "alpha"
BROKEN= doesn\'t build on the alpha yet
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 1be86a4..aae3a17 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: PostgreSQL
# Version required: 6.4.2
# Date created: November 13, 1998
-# Whom: Marc G. Fournier <scrappy@FreeBSD.ORG>
+# Whom: Marc G. Fournier <scrappy@FreeBSD.org>
#
# $FreeBSD$
#
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.postgresql.org/pub/ \
ftp://ftp.incoma.ru/pub/unix/postgresql/ \
ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
.if ${MACHINE_ARCH} == "alpha"
BROKEN= doesn\'t build on the alpha yet
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index 1be86a4..aae3a17 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: PostgreSQL
# Version required: 6.4.2
# Date created: November 13, 1998
-# Whom: Marc G. Fournier <scrappy@FreeBSD.ORG>
+# Whom: Marc G. Fournier <scrappy@FreeBSD.org>
#
# $FreeBSD$
#
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.postgresql.org/pub/ \
ftp://ftp.incoma.ru/pub/unix/postgresql/ \
ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
.if ${MACHINE_ARCH} == "alpha"
BROKEN= doesn\'t build on the alpha yet
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 1be86a4..aae3a17 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: PostgreSQL
# Version required: 6.4.2
# Date created: November 13, 1998
-# Whom: Marc G. Fournier <scrappy@FreeBSD.ORG>
+# Whom: Marc G. Fournier <scrappy@FreeBSD.org>
#
# $FreeBSD$
#
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.postgresql.org/pub/ \
ftp://ftp.incoma.ru/pub/unix/postgresql/ \
ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
.if ${MACHINE_ARCH} == "alpha"
BROKEN= doesn\'t build on the alpha yet
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 1be86a4..aae3a17 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: PostgreSQL
# Version required: 6.4.2
# Date created: November 13, 1998
-# Whom: Marc G. Fournier <scrappy@FreeBSD.ORG>
+# Whom: Marc G. Fournier <scrappy@FreeBSD.org>
#
# $FreeBSD$
#
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.postgresql.org/pub/ \
ftp://ftp.incoma.ru/pub/unix/postgresql/ \
ftp://ftp.sunet.se/pub/unix/databases/relational/postgresql/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
.if ${MACHINE_ARCH} == "alpha"
BROKEN= doesn\'t build on the alpha yet
diff --git a/databases/py-PyGreSQL/Makefile b/databases/py-PyGreSQL/Makefile
index f6e0b53..432fe7c 100644
--- a/databases/py-PyGreSQL/Makefile
+++ b/databases/py-PyGreSQL/Makefile
@@ -1,7 +1,7 @@
# Ports collection Makefile for: PyGreSQL
# Version required: 2.3
# Date created: 2/22/1999
-# Whom: nectar@FreeBSD.ORG
+# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.druid.net/pub/distrib/ \
http://www.nectar.cc/distfiles/
EXTRACT_SUFX= .tgz
-MAINTAINER= nectar@FreeBSD.ORG
+MAINTAINER= nectar@FreeBSD.org
BUILD_DEPENDS= python:${PORTSDIR}/lang/python
RUN_DEPENDS= python:${PORTSDIR}/lang/python
diff --git a/databases/tkgnats/Makefile b/databases/tkgnats/Makefile
index 89dacac..b66dec4 100644
--- a/databases/tkgnats/Makefile
+++ b/databases/tkgnats/Makefile
@@ -10,7 +10,7 @@ DISTNAME= tkgnats-3.0.10
CATEGORIES= databases tk80
MASTER_SITES= http://www.cuug.ab.ca/~macdonal/tkgnats/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
BUILD_DEPENDS= nedit-pr:${PORTSDIR}/databases/gnats
LIB_DEPENDS= tk81.1:${PORTSDIR}/x11-toolkits/tk81
diff --git a/databases/xmbase-grok/Makefile b/databases/xmbase-grok/Makefile
index f2a19c9..ff17cd1 100644
--- a/databases/xmbase-grok/Makefile
+++ b/databases/xmbase-grok/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
ftp://ftp.fu-berlin.de/pub/unix/databases/xmbase-grok/
MASTER_SITE_SUBDIR= applications
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
REQUIRES_MOTIF= yes
USE_IMAKE= yes
diff --git a/databases/xmysql/Makefile b/databases/xmysql/Makefile
index 4a34a05..7125772 100644
--- a/databases/xmysql/Makefile
+++ b/databases/xmysql/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://www.tcx.se/Contrib/ \
http://www.buoy.com/mysql/Contrib/ \
http://web.tryc.on.ca/mysql/Downloads/Contrib/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
xforms.0:${PORTSDIR}/x11-toolkits/xforms \
diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile
index 0539df0..61d99e0 100644
--- a/databases/xmysqladmin/Makefile
+++ b/databases/xmysqladmin/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.tcx.se/Contrib/ \
http://web.tryc.on.ca/mysql/Downloads/Contrib/ \
http://mysql.acer.net/Contrib/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
xforms.0:${PORTSDIR}/x11-toolkits/xforms \
diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile
index 9733b1b..d4340c6 100644
--- a/deskutils/gnome-pim/Makefile
+++ b/deskutils/gnome-pim/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: gnomepim
# Version required: 1.0.9
# Date created: 17 Jan 1999
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/deskutils/gnomepim/Makefile b/deskutils/gnomepim/Makefile
index 9733b1b..d4340c6 100644
--- a/deskutils/gnomepim/Makefile
+++ b/deskutils/gnomepim/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: gnomepim
# Version required: 1.0.9
# Date created: 17 Jan 1999
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/deskutils/ical/Makefile b/deskutils/ical/Makefile
index 7cf8549..d648336 100644
--- a/deskutils/ical/Makefile
+++ b/deskutils/ical/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ical-2.2
CATEGORIES= deskutils tk80
MASTER_SITES= http://www.research.digital.com/SRC/personal/Sanjay_Ghemawat/ical/icalbins/
-MAINTAINER= erich@FreeBSD.ORG
+MAINTAINER= erich@FreeBSD.org
LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
diff --git a/deskutils/xpostit/Makefile b/deskutils/xpostit/Makefile
index 53dd1ad..09f8181 100644
--- a/deskutils/xpostit/Makefile
+++ b/deskutils/xpostit/Makefile
@@ -17,7 +17,7 @@ CATEGORIES= deskutils
MASTER_SITES= ftp://ftp.hrz.tu-darmstadt.de/pub/X11/R5contrib/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= joerg@FreeBSD.ORG
+MAINTAINER= joerg@FreeBSD.org
USE_IMAKE= yes
WRKSRC= ${WRKDIR}/xpostit
diff --git a/devel/SWIG-devel/Makefile b/devel/SWIG-devel/Makefile
index 9e6efd6..27d45ae 100644
--- a/devel/SWIG-devel/Makefile
+++ b/devel/SWIG-devel/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.cs.utah.edu/pub/beazley/SWIG/ \
ftp://ftp.rge.com/pub/languages/swig/ \
ftp://ftp.mcc.ac.uk/pub/mvc/swig/
-MAINTAINER= erich@FreeBSD.ORG
+MAINTAINER= erich@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/bin/python:${PORTSDIR}/lang/python \
${PREFIX}/bin/tclsh8.0:${PORTSDIR}/lang/tcl80
diff --git a/devel/SWIG/Makefile b/devel/SWIG/Makefile
index 9e6efd6..27d45ae 100644
--- a/devel/SWIG/Makefile
+++ b/devel/SWIG/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.cs.utah.edu/pub/beazley/SWIG/ \
ftp://ftp.rge.com/pub/languages/swig/ \
ftp://ftp.mcc.ac.uk/pub/mvc/swig/
-MAINTAINER= erich@FreeBSD.ORG
+MAINTAINER= erich@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/bin/python:${PORTSDIR}/lang/python \
${PREFIX}/bin/tclsh8.0:${PORTSDIR}/lang/tcl80
diff --git a/devel/SpecTcl/Makefile b/devel/SpecTcl/Makefile
index a00d2da..8ebc6cc 100644
--- a/devel/SpecTcl/Makefile
+++ b/devel/SpecTcl/Makefile
@@ -11,7 +11,7 @@ PKGNAME= SpecTcl-1.1
CATEGORIES= devel tk80
MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/guitools/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index cfc8bf8..82c2662 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: autoconf
# Version required: 2.13
# Date created: 7 October 1995
-# Whom: torstenb@FreeBSD.ORG
+# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= autoconf
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile
index cfc8bf8..82c2662 100644
--- a/devel/autoconf213/Makefile
+++ b/devel/autoconf213/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: autoconf
# Version required: 2.13
# Date created: 7 October 1995
-# Whom: torstenb@FreeBSD.ORG
+# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= autoconf
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/devel/autoconf253/Makefile b/devel/autoconf253/Makefile
index cfc8bf8..82c2662 100644
--- a/devel/autoconf253/Makefile
+++ b/devel/autoconf253/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: autoconf
# Version required: 2.13
# Date created: 7 October 1995
-# Whom: torstenb@FreeBSD.ORG
+# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= autoconf
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/devel/autoconf254/Makefile b/devel/autoconf254/Makefile
index cfc8bf8..82c2662 100644
--- a/devel/autoconf254/Makefile
+++ b/devel/autoconf254/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: autoconf
# Version required: 2.13
# Date created: 7 October 1995
-# Whom: torstenb@FreeBSD.ORG
+# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= autoconf
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/devel/autoconf257/Makefile b/devel/autoconf257/Makefile
index cfc8bf8..82c2662 100644
--- a/devel/autoconf257/Makefile
+++ b/devel/autoconf257/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: autoconf
# Version required: 2.13
# Date created: 7 October 1995
-# Whom: torstenb@FreeBSD.ORG
+# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= autoconf
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/devel/autoconf259/Makefile b/devel/autoconf259/Makefile
index cfc8bf8..82c2662 100644
--- a/devel/autoconf259/Makefile
+++ b/devel/autoconf259/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: autoconf
# Version required: 2.13
# Date created: 7 October 1995
-# Whom: torstenb@FreeBSD.ORG
+# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= autoconf
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/devel/autoconf26/Makefile b/devel/autoconf26/Makefile
index cfc8bf8..82c2662 100644
--- a/devel/autoconf26/Makefile
+++ b/devel/autoconf26/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: autoconf
# Version required: 2.13
# Date created: 7 October 1995
-# Whom: torstenb@FreeBSD.ORG
+# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= autoconf
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/devel/autoconf261/Makefile b/devel/autoconf261/Makefile
index cfc8bf8..82c2662 100644
--- a/devel/autoconf261/Makefile
+++ b/devel/autoconf261/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: autoconf
# Version required: 2.13
# Date created: 7 October 1995
-# Whom: torstenb@FreeBSD.ORG
+# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= autoconf
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/devel/autoconf262/Makefile b/devel/autoconf262/Makefile
index cfc8bf8..82c2662 100644
--- a/devel/autoconf262/Makefile
+++ b/devel/autoconf262/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: autoconf
# Version required: 2.13
# Date created: 7 October 1995
-# Whom: torstenb@FreeBSD.ORG
+# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= autoconf
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/devel/autoconf267/Makefile b/devel/autoconf267/Makefile
index cfc8bf8..82c2662 100644
--- a/devel/autoconf267/Makefile
+++ b/devel/autoconf267/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: autoconf
# Version required: 2.13
# Date created: 7 October 1995
-# Whom: torstenb@FreeBSD.ORG
+# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= autoconf
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/devel/autoconf268/Makefile b/devel/autoconf268/Makefile
index cfc8bf8..82c2662 100644
--- a/devel/autoconf268/Makefile
+++ b/devel/autoconf268/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: autoconf
# Version required: 2.13
# Date created: 7 October 1995
-# Whom: torstenb@FreeBSD.ORG
+# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= autoconf
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/devel/cs/Makefile b/devel/cs/Makefile
index b61df0c..821cdc0 100644
--- a/devel/cs/Makefile
+++ b/devel/cs/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: cs
# Version required: 0.5
# Date created: 22 May 1997
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/devel/ctags/Makefile b/devel/ctags/Makefile
index 03ffbfa..9f729f0 100644
--- a/devel/ctags/Makefile
+++ b/devel/ctags/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE}\
http://fly.hiwaay.net/~darren/archives/ \
http://www.freebsd.org/~jkoshy/PORTS/
-MAINTAINER= jkoshy@FreeBSD.ORG
+MAINTAINER= jkoshy@FreeBSD.org
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-macro-patterns
diff --git a/devel/cvsweb/Makefile b/devel/cvsweb/Makefile
index 614e217..bacd15b 100644
--- a/devel/cvsweb/Makefile
+++ b/devel/cvsweb/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: cvsweb
# Version required: 1.0
# Date created: 27 Jun 1999
-# Whom: SADA Kenji <sada@FreeBSD.ORG>
+# Whom: SADA Kenji <sada@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= cvsweb-1.0
CATEGORIES= devel www
MASTER_SITES= http://www.freebsd.org/~fenner/cvsweb/
-MAINTAINER= sada@FreeBSD.ORG
+MAINTAINER= sada@FreeBSD.org
NO_BUILD= yes
diff --git a/devel/cvsweb3/Makefile b/devel/cvsweb3/Makefile
index 614e217..bacd15b 100644
--- a/devel/cvsweb3/Makefile
+++ b/devel/cvsweb3/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: cvsweb
# Version required: 1.0
# Date created: 27 Jun 1999
-# Whom: SADA Kenji <sada@FreeBSD.ORG>
+# Whom: SADA Kenji <sada@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= cvsweb-1.0
CATEGORIES= devel www
MASTER_SITES= http://www.freebsd.org/~fenner/cvsweb/
-MAINTAINER= sada@FreeBSD.ORG
+MAINTAINER= sada@FreeBSD.org
NO_BUILD= yes
diff --git a/devel/cweb/Makefile b/devel/cweb/Makefile
index 7ea7dc7..14431d6 100644
--- a/devel/cweb/Makefile
+++ b/devel/cweb/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: cweb
# Version required: 3.41
# Date created: 10 Feb 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
MASTER_SITE_SUBDIR= web/c_cpp/cweb
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
NO_WRKSUBDIR= yes
MAN1= cweb.1
diff --git a/devel/cxref/Makefile b/devel/cxref/Makefile
index 2685691..d102b65 100644
--- a/devel/cxref/Makefile
+++ b/devel/cxref/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= devel
MASTER_SITES= ftp://ftp.demon.co.uk/pub/unix/tools/
EXTRACT_SUFX= .tgz
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
USE_GMAKE= yes
ALL_TARGET= cxref-inst cxref-query
diff --git a/devel/dmake/Makefile b/devel/dmake/Makefile
index bdebaf5..d91c526 100644
--- a/devel/dmake/Makefile
+++ b/devel/dmake/Makefile
@@ -11,7 +11,7 @@ PKGNAME= dmake-4.1
CATEGORIES= devel
MASTER_SITES= ftp://plg.uwaterloo.ca/pub/dmake/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
WRKSRC= ${WRKDIR}/dmake
USE_GMAKE= yes
diff --git a/devel/flick/Makefile b/devel/flick/Makefile
index b89e52a..d4e0ced 100644
--- a/devel/flick/Makefile
+++ b/devel/flick/Makefile
@@ -11,7 +11,7 @@ PKGNAME= flick-1.1
CATEGORIES= devel
MASTER_SITES= ftp://flux.cs.utah.edu/flux/flick/1.1/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/devel/gcc-6811/Makefile b/devel/gcc-6811/Makefile
index abd158a..34e994c 100644
--- a/devel/gcc-6811/Makefile
+++ b/devel/gcc-6811/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel
MASTER_SITES= ftp://nyquist.ee.ualberta.ca/pub/motorola/68hc11/gcc/
DISTFILES= gcc-6811-fsf.tar.gz gcc-2.6.3.tar.gz
-MAINTAINER= erich@FreeBSD.ORG
+MAINTAINER= erich@FreeBSD.org
NO_WRKSUBDIR= yes
diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile
index ab115fb..ca9eb32 100644
--- a/devel/glib12/Makefile
+++ b/devel/glib12/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: glib12
# Version required: 1.2.3
# Date Created: 28 July 1998
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
http://www.ameth.org/gimp/gtk/v1.2/
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
USE_LIBTOOL= yes
CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib12
diff --git a/devel/glib13/Makefile b/devel/glib13/Makefile
index ab115fb..ca9eb32 100644
--- a/devel/glib13/Makefile
+++ b/devel/glib13/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: glib12
# Version required: 1.2.3
# Date Created: 28 July 1998
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
http://www.ameth.org/gimp/gtk/v1.2/
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
USE_LIBTOOL= yes
CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib12
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index ab115fb..ca9eb32 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: glib12
# Version required: 1.2.3
# Date Created: 28 July 1998
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
http://www.ameth.org/gimp/gtk/v1.2/
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
USE_LIBTOOL= yes
CONFIGURE_ARGS= --includedir=${PREFIX}/include/glib12
diff --git a/devel/gnu-autoconf/Makefile b/devel/gnu-autoconf/Makefile
index cfc8bf8..82c2662 100644
--- a/devel/gnu-autoconf/Makefile
+++ b/devel/gnu-autoconf/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: autoconf
# Version required: 2.13
# Date created: 7 October 1995
-# Whom: torstenb@FreeBSD.ORG
+# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= autoconf
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index 3825abb..e16968a 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: gnustep
# Version required: 0.5.5
# Date created: 03 October 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= devel
MASTER_SITES= ftp://ftp.gnustep.org/pub/gnustep/core/ \
ftp://ftp.peanuts.org/Mirrors/GNUstep/gnustep/core/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff34
diff --git a/devel/gnustep/Makefile b/devel/gnustep/Makefile
index 3825abb..e16968a 100644
--- a/devel/gnustep/Makefile
+++ b/devel/gnustep/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: gnustep
# Version required: 0.5.5
# Date created: 03 October 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= devel
MASTER_SITES= ftp://ftp.gnustep.org/pub/gnustep/core/ \
ftp://ftp.peanuts.org/Mirrors/GNUstep/gnustep/core/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff34
diff --git a/devel/id-utils/Makefile b/devel/id-utils/Makefile
index c28360f..5c8b4e2f 100644
--- a/devel/id-utils/Makefile
+++ b/devel/id-utils/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= id-utils
-MAINTAINER= pst@FreeBSD.ORG
+MAINTAINER= pst@FreeBSD.org
Y2K= http://www.gnu.org/software/year2000.html
diff --git a/devel/idutils/Makefile b/devel/idutils/Makefile
index c28360f..5c8b4e2f 100644
--- a/devel/idutils/Makefile
+++ b/devel/idutils/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= id-utils
-MAINTAINER= pst@FreeBSD.ORG
+MAINTAINER= pst@FreeBSD.org
Y2K= http://www.gnu.org/software/year2000.html
diff --git a/devel/libdlmalloc/Makefile b/devel/libdlmalloc/Makefile
index f827598..29066aa 100644
--- a/devel/libdlmalloc/Makefile
+++ b/devel/libdlmalloc/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel
MASTER_SITES= ftp://gee.cs.oswego.edu/pub/misc/
DISTFILES= malloc-2.6.5.c
-MAINTAINER= roberto@FreeBSD.ORG
+MAINTAINER= roberto@FreeBSD.org
NO_WRKSUBDIR= yes
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index c285c489..8e70366 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: libgtop
# Version required: 1.1.0
# Date Created: 26 Sep 1998
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index c285c489..8e70366 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: libgtop
# Version required: 1.1.0
# Date Created: 26 Sep 1998
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/devel/m4/Makefile b/devel/m4/Makefile
index 2444b9d..63f7a6c 100644
--- a/devel/m4/Makefile
+++ b/devel/m4/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= m4
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
Y2K= http://www.gnu.org/software/year2000.html
diff --git a/devel/m6811-gcc/Makefile b/devel/m6811-gcc/Makefile
index abd158a..34e994c 100644
--- a/devel/m6811-gcc/Makefile
+++ b/devel/m6811-gcc/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel
MASTER_SITES= ftp://nyquist.ee.ualberta.ca/pub/motorola/68hc11/gcc/
DISTFILES= gcc-6811-fsf.tar.gz gcc-2.6.3.tar.gz
-MAINTAINER= erich@FreeBSD.ORG
+MAINTAINER= erich@FreeBSD.org
NO_WRKSUBDIR= yes
diff --git a/devel/noweb/Makefile b/devel/noweb/Makefile
index a35b4a2..571c359 100644
--- a/devel/noweb/Makefile
+++ b/devel/noweb/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= devel
MASTER_SITES= ftp://ftp.cs.virginia.edu/pub/nr/
EXTRACT_SUFX= .tgz
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
BUILD_DEPENDS= icont:${PORTSDIR}/lang/icon
RUN_DEPENDS= iconx:${PORTSDIR}/lang/icon
diff --git a/devel/p5-BSD-Resource/Makefile b/devel/p5-BSD-Resource/Makefile
index 234bf1b..3522bae 100644
--- a/devel/p5-BSD-Resource/Makefile
+++ b/devel/p5-BSD-Resource/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= BSD
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/devel/p5-C-Scan/Makefile b/devel/p5-C-Scan/Makefile
index d4c5aad..8ff2f01 100644
--- a/devel/p5-C-Scan/Makefile
+++ b/devel/p5-C-Scan/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= C
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Data/Flow.pm:${PORTSDIR}/devel/p5-Data-Flow
diff --git a/devel/p5-Config-IniFiles/Makefile b/devel/p5-Config-IniFiles/Makefile
index 4b9d086..99175bf 100644
--- a/devel/p5-Config-IniFiles/Makefile
+++ b/devel/p5-Config-IniFiles/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= IniConf
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/devel/p5-ConfigReader/Makefile b/devel/p5-ConfigReader/Makefile
index 815fe11..88013d5 100644
--- a/devel/p5-ConfigReader/Makefile
+++ b/devel/p5-ConfigReader/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= ConfigReader
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/devel/p5-Curses/Makefile b/devel/p5-Curses/Makefile
index 24ce1fe..edd21b4 100644
--- a/devel/p5-Curses/Makefile
+++ b/devel/p5-Curses/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Curses
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/devel/p5-Data-Flow/Makefile b/devel/p5-Data-Flow/Makefile
index e4dabb4..85db9dd 100644
--- a/devel/p5-Data-Flow/Makefile
+++ b/devel/p5-Data-Flow/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Data
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/devel/p5-Data-ShowTable/Makefile b/devel/p5-Data-ShowTable/Makefile
index 8ebb815..2aab64b 100644
--- a/devel/p5-Data-ShowTable/Makefile
+++ b/devel/p5-Data-ShowTable/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Data
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
CONFIGURE_ARGS= PREFIX=${PREFIX} INSTALLSCRIPT=${PREFIX}/bin INSTALLMAN1DIR=${PREFIX}/man/man1
diff --git a/devel/p5-Date-Manip/Makefile b/devel/p5-Date-Manip/Makefile
index 0033412..96b9901 100644
--- a/devel/p5-Date-Manip/Makefile
+++ b/devel/p5-Date-Manip/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Date
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/devel/p5-Devel-DProf/Makefile b/devel/p5-Devel-DProf/Makefile
index 52e90cb..a393407 100644
--- a/devel/p5-Devel-DProf/Makefile
+++ b/devel/p5-Devel-DProf/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Devel
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
CONFIGURE_ARGS= PREFIX=${PREFIX}
USE_PERL5= YES
diff --git a/devel/p5-Devel-Peek/Makefile b/devel/p5-Devel-Peek/Makefile
index 11cf555..c2b59d5 100644
--- a/devel/p5-Devel-Peek/Makefile
+++ b/devel/p5-Devel-Peek/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Devel
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/devel/p5-Devel-Symdump/Makefile b/devel/p5-Devel-Symdump/Makefile
index 8d7d05dc..63db541 100644
--- a/devel/p5-Devel-Symdump/Makefile
+++ b/devel/p5-Devel-Symdump/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Devel
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/devel/p5-Errno/Makefile b/devel/p5-Errno/Makefile
index df81116..0ab747c 100644
--- a/devel/p5-Errno/Makefile
+++ b/devel/p5-Errno/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: p5-Errno
# Version required: 1.02
# Date created: June 26th 1997
-# Whom: James FitzGibbon <jfitz@FreeBSD.ORG>
+# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Errno
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/devel/p5-File-BasicFlock/Makefile b/devel/p5-File-BasicFlock/Makefile
index 35c3325..e677dcc 100644
--- a/devel/p5-File-BasicFlock/Makefile
+++ b/devel/p5-File-BasicFlock/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= File
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/devel/p5-File-Lock/Makefile b/devel/p5-File-Lock/Makefile
index 2858463..8ffd5ea 100644
--- a/devel/p5-File-Lock/Makefile
+++ b/devel/p5-File-Lock/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= File
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/devel/p5-File-Slurp/Makefile b/devel/p5-File-Slurp/Makefile
index 6dbd20a..5fa3bf8 100644
--- a/devel/p5-File-Slurp/Makefile
+++ b/devel/p5-File-Slurp/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= File
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/devel/p5-File-Tools/Makefile b/devel/p5-File-Tools/Makefile
index b051cb7..8933429 100644
--- a/devel/p5-File-Tools/Makefile
+++ b/devel/p5-File-Tools/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= File
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/devel/p5-Filter/Makefile b/devel/p5-Filter/Makefile
index 0d5c7e3..707a9ba 100644
--- a/devel/p5-Filter/Makefile
+++ b/devel/p5-Filter/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: p5-Filter
# Version required: 1.14
# Date created: June 26th 1997
-# Whom: James FitzGibbon <jfitz@FreeBSD.ORG>
+# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Filter
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/devel/p5-FreezeThaw/Makefile b/devel/p5-FreezeThaw/Makefile
index 0cc8b85..d7963ec 100644
--- a/devel/p5-FreezeThaw/Makefile
+++ b/devel/p5-FreezeThaw/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= FreezeThaw
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/devel/p5-IO-stringy/Makefile b/devel/p5-IO-stringy/Makefile
index 02b9985..0410808 100644
--- a/devel/p5-IO-stringy/Makefile
+++ b/devel/p5-IO-stringy/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: p5-IO-stringy
# Version required: 1.203
# Date created: April 27 1998
-# Whom: Eivind Eklund <eivind@FreeBSD.ORG>
+# Whom: Eivind Eklund <eivind@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= IO
-MAINTAINER= eivind@FreeBSD.ORG
+MAINTAINER= eivind@FreeBSD.org
USE_PERL5= YES
diff --git a/devel/p5-Include/Makefile b/devel/p5-Include/Makefile
index b00b6c8..6609a64 100644
--- a/devel/p5-Include/Makefile
+++ b/devel/p5-Include/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Include
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/devel/p5-IniConf/Makefile b/devel/p5-IniConf/Makefile
index 4b9d086..99175bf 100644
--- a/devel/p5-IniConf/Makefile
+++ b/devel/p5-IniConf/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= IniConf
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/devel/p5-PV/Makefile b/devel/p5-PV/Makefile
index 6685156..644491a0 100644
--- a/devel/p5-PV/Makefile
+++ b/devel/p5-PV/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= PV
EXTRACT_SUFX= .tgz
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
RUN_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/i386-freebsd/Curses.pm:${PORTSDIR}/devel/p5-Curses
diff --git a/devel/p5-Penguin-Easy/Makefile b/devel/p5-Penguin-Easy/Makefile
index 9fba7c6..a5fb62c 100644
--- a/devel/p5-Penguin-Easy/Makefile
+++ b/devel/p5-Penguin-Easy/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel security perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Penguin
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Penguin.pm:${PORTSDIR}/devel/p5-Penguin
diff --git a/devel/p5-Penguin/Makefile b/devel/p5-Penguin/Makefile
index 85f16ba..5337b12 100644
--- a/devel/p5-Penguin/Makefile
+++ b/devel/p5-Penguin/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel security perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Penguin
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
RUN_DEPENDS= pgp:${PORTSDIR}/security/pgp
diff --git a/devel/p5-Proc-Simple/Makefile b/devel/p5-Proc-Simple/Makefile
index 7e00c83..2a2eab9 100644
--- a/devel/p5-Proc-Simple/Makefile
+++ b/devel/p5-Proc-Simple/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: p5-Proc-Simple
# Version required: 1.12
# Date created: June 26th 1997
-# Whom: James FitzGibbon <jfitz@FreeBSD.ORG>
+# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Proc
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/devel/p5-Religion/Makefile b/devel/p5-Religion/Makefile
index b4be9a4..2a1569b 100644
--- a/devel/p5-Religion/Makefile
+++ b/devel/p5-Religion/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Religion
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/devel/p5-Resources/Makefile b/devel/p5-Resources/Makefile
index 4f529d6..719ac9c 100644
--- a/devel/p5-Resources/Makefile
+++ b/devel/p5-Resources/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Resources
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/devel/p5-Sort-Versions/Makefile b/devel/p5-Sort-Versions/Makefile
index e1b7da3..b6b0c79 100644
--- a/devel/p5-Sort-Versions/Makefile
+++ b/devel/p5-Sort-Versions/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: p5-Sort-Versions
# Version required: 1.1
# Date created: June 26th 1997
-# Whom: James FitzGibbon <jfitz@FreeBSD.ORG>
+# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Sort
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/devel/p5-Storable/Makefile b/devel/p5-Storable/Makefile
index 440e1dd..92bea80 100644
--- a/devel/p5-Storable/Makefile
+++ b/devel/p5-Storable/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Storable
EXTRACT_SUFX= ..tar.gz
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/devel/p5-Term-Query/Makefile b/devel/p5-Term-Query/Makefile
index 8adb0b6..cf13910 100644
--- a/devel/p5-Term-Query/Makefile
+++ b/devel/p5-Term-Query/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Term
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
RUN_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Array/PrintCols.pm:${PORTSDIR}/misc/p5-Array-PrintCols
diff --git a/devel/p5-Term-ReadKey/Makefile b/devel/p5-Term-ReadKey/Makefile
index 13339b6..acb9bc6 100644
--- a/devel/p5-Term-ReadKey/Makefile
+++ b/devel/p5-Term-ReadKey/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: p5-Term-ReadKey
# Version required: 2.12
# Date created: June 26th 1997
-# Whom: James FitzGibbon <jfitz@FreeBSD.ORG>
+# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Term
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/devel/p5-Time-HiRes/Makefile b/devel/p5-Time-HiRes/Makefile
index dcfbc06..0d86dbd 100644
--- a/devel/p5-Time-HiRes/Makefile
+++ b/devel/p5-Time-HiRes/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Time
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
USE_PERL5= yes
diff --git a/devel/p5-Time/Makefile b/devel/p5-Time/Makefile
index 91cb0c0..dd6d264 100644
--- a/devel/p5-Time/Makefile
+++ b/devel/p5-Time/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Time
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/devel/p5-TimeDate/Makefile b/devel/p5-TimeDate/Makefile
index 6c35c6c..02546e5 100644
--- a/devel/p5-TimeDate/Makefile
+++ b/devel/p5-TimeDate/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Date
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
USE_PERL5= YES
diff --git a/devel/p5-TraceFuncs/Makefile b/devel/p5-TraceFuncs/Makefile
index e1333ab..3974fe6 100644
--- a/devel/p5-TraceFuncs/Makefile
+++ b/devel/p5-TraceFuncs/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: p5-TraceFuncs
# Version required: 0.1
# Date created: June 26th 1997
-# Whom: James FitzGibbon <jfitz@FreeBSD.ORG>
+# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Devel
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/devel/prcs/Makefile b/devel/prcs/Makefile
index 635980c..1683850 100644
--- a/devel/prcs/Makefile
+++ b/devel/prcs/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: prcs
# Version required: 1.2.4
# Date created: 17 Sep 96
-# Whom: jmacd@FreeBSD.ORG
+# Whom: jmacd@FreeBSD.org
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= prcs-1.2.8
CATEGORIES= devel
MASTER_SITES= ftp://ftp.xcf.berkeley.edu/pub/prcs/
-MAINTAINER= jmacd@FreeBSD.ORG
+MAINTAINER= jmacd@FreeBSD.org
BUILD_DEPENDS= emacs:${PORTSDIR}/editors/emacs
diff --git a/devel/py-kjbuckets/Makefile b/devel/py-kjbuckets/Makefile
index 543c9dc..cd5c12d 100644
--- a/devel/py-kjbuckets/Makefile
+++ b/devel/py-kjbuckets/Makefile
@@ -1,7 +1,7 @@
# Ports collection Makefile for: kjbuckets
# Version required: 2.2
# Date created: 03/27/1999
-# Whom: nectar@FreeBSD.ORG
+# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= devel
MASTER_SITES= http://www.chordate.com/kjbuckets/ \
http://www.nectar.com/distfiles/
-MAINTAINER= nectar@FreeBSD.ORG
+MAINTAINER= nectar@FreeBSD.org
BUILD_DEPENDS= python:${PORTSDIR}/lang/python
RUN_DEPENDS= python:${PORTSDIR}/lang/python
diff --git a/devel/py-mxDateTime/Makefile b/devel/py-mxDateTime/Makefile
index 6990e11..e138d8d 100644
--- a/devel/py-mxDateTime/Makefile
+++ b/devel/py-mxDateTime/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: py-mxDateTime
# Version required: 1.3.0
# Date created: 12 May 1999
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= py-mxDateTime-1.3.0
CATEGORIES= devel python
MASTER_SITES= http://starship.skyport.net/~lemburg/
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
BUILD_DEPENDS= python:${PORTSDIR}/lang/python
RUN_DEPENDS= python:${PORTSDIR}/lang/python
diff --git a/devel/py-mxStack/Makefile b/devel/py-mxStack/Makefile
index 4df828a..046b716 100644
--- a/devel/py-mxStack/Makefile
+++ b/devel/py-mxStack/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: py-mxStack
# Version required: 0.3.0
# Date created: 14 May 1999
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= py-mxStack-0.3.0
CATEGORIES= devel python
MASTER_SITES= http://starship.skyport.net/~lemburg/
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
BUILD_DEPENDS= python:${PORTSDIR}/lang/python
RUN_DEPENDS= python:${PORTSDIR}/lang/python
diff --git a/devel/py-mxTools/Makefile b/devel/py-mxTools/Makefile
index 10a8e10..91b13d4 100644
--- a/devel/py-mxTools/Makefile
+++ b/devel/py-mxTools/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: py-mxTools
# Version required: 1.0.0
# Date created: 20 May 1999
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= py-mxTools-1.0.0
CATEGORIES= devel python
MASTER_SITES= http://starship.skyport.net/~lemburg/
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
BUILD_DEPENDS= python:${PORTSDIR}/lang/python
RUN_DEPENDS= python:${PORTSDIR}/lang/python
diff --git a/devel/re2c/Makefile b/devel/re2c/Makefile
index cd2d3ff..bdffcce 100644
--- a/devel/re2c/Makefile
+++ b/devel/re2c/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: re2c
# Version required: 0.5
# Date created: 14 May 1998
-# Whom: Eivind Eklund <eivind@FreeBSD.ORG>
+# Whom: Eivind Eklund <eivind@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://csg.uwaterloo.ca/pub/peter/ \
ftp://ftp.uni-trier.de/pub/unix/compiler-toolkit/re2c/ \
ftp://ftp.tut.ac.jp/.h3/UNIX/lib/
-MAINTAINER= eivind@FreeBSD.ORG
+MAINTAINER= eivind@FreeBSD.org
MAN1= re2c.1
diff --git a/devel/swig11/Makefile b/devel/swig11/Makefile
index 9e6efd6..27d45ae 100644
--- a/devel/swig11/Makefile
+++ b/devel/swig11/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.cs.utah.edu/pub/beazley/SWIG/ \
ftp://ftp.rge.com/pub/languages/swig/ \
ftp://ftp.mcc.ac.uk/pub/mvc/swig/
-MAINTAINER= erich@FreeBSD.ORG
+MAINTAINER= erich@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/bin/python:${PORTSDIR}/lang/python \
${PREFIX}/bin/tclsh8.0:${PORTSDIR}/lang/tcl80
diff --git a/devel/swig13/Makefile b/devel/swig13/Makefile
index 9e6efd6..27d45ae 100644
--- a/devel/swig13/Makefile
+++ b/devel/swig13/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.cs.utah.edu/pub/beazley/SWIG/ \
ftp://ftp.rge.com/pub/languages/swig/ \
ftp://ftp.mcc.ac.uk/pub/mvc/swig/
-MAINTAINER= erich@FreeBSD.ORG
+MAINTAINER= erich@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/bin/python:${PORTSDIR}/lang/python \
${PREFIX}/bin/tclsh8.0:${PORTSDIR}/lang/tcl80
diff --git a/devel/swig20/Makefile b/devel/swig20/Makefile
index 9e6efd6..27d45ae 100644
--- a/devel/swig20/Makefile
+++ b/devel/swig20/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.cs.utah.edu/pub/beazley/SWIG/ \
ftp://ftp.rge.com/pub/languages/swig/ \
ftp://ftp.mcc.ac.uk/pub/mvc/swig/
-MAINTAINER= erich@FreeBSD.ORG
+MAINTAINER= erich@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/bin/python:${PORTSDIR}/lang/python \
${PREFIX}/bin/tclsh8.0:${PORTSDIR}/lang/tcl80
diff --git a/devel/vtcl/Makefile b/devel/vtcl/Makefile
index c6041a5..dca8278 100644
--- a/devel/vtcl/Makefile
+++ b/devel/vtcl/Makefile
@@ -10,7 +10,7 @@ DISTNAME= vtcl-1.2.0
CATEGORIES= devel tk80
MASTER_SITES= ftp://ftp.neuron.com/pub/vtcl/development/1.2/
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
diff --git a/devel/xxgdb/Makefile b/devel/xxgdb/Makefile
index 2bfa9bf..ac73d81 100644
--- a/devel/xxgdb/Makefile
+++ b/devel/xxgdb/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= utilities
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
USE_IMAKE= yes
diff --git a/dns/h2n/Makefile b/dns/h2n/Makefile
index 9d5e702..2e5e4f4 100644
--- a/dns/h2n/Makefile
+++ b/dns/h2n/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: h2n
# Version required: 1.29
# Date created: 27 Nov 1997
-# Whom: SADA Kenji <sada@FreeBSD.ORG>
+# Whom: SADA Kenji <sada@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.iij.ad.jp/pub/published/oreilly/nutshell/dnsbind/ \
ftp://ftp.uu.net/published/oreilly/nutshell/dnsbind/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= sada@FreeBSD.ORG
+MAINTAINER= sada@FreeBSD.org
NO_BUILD= YES
NO_WRKSUBDIR= YES
diff --git a/dns/hesiod/Makefile b/dns/hesiod/Makefile
index 20ae3ff..1744782 100644
--- a/dns/hesiod/Makefile
+++ b/dns/hesiod/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= net
MASTER_SITES= ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/ \
http://www.nectar.cc/distfiles/
-MAINTAINER= nectar@FreeBSD.ORG
+MAINTAINER= nectar@FreeBSD.org
MAN1= hesinfo.1
MAN3= hesiod.3 hesiod_end.3 hesiod_free_list.3 \
diff --git a/dns/p5-Net-DNS/Makefile b/dns/p5-Net-DNS/Makefile
index f01c018..db02e38 100644
--- a/dns/p5-Net-DNS/Makefile
+++ b/dns/p5-Net-DNS/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Net
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/editors/AbiWord/Makefile b/editors/AbiWord/Makefile
index de77590..25d2d9c 100644
--- a/editors/AbiWord/Makefile
+++ b/editors/AbiWord/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: AbiWord
# Version required: 0.5.5
# Date created: 3 Mar 1999
-# Whom: Donald Burr <dburr@FreeBSD.ORG>
+# Whom: Donald Burr <dburr@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.abisource.com/downloads/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} expat.tar.gz \
unixfonts-0.5.4.tar.gz
-MAINTAINER= dburr@FreeBSD.ORG
+MAINTAINER= dburr@FreeBSD.org
BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash2
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
diff --git a/editors/AbiWord2/Makefile b/editors/AbiWord2/Makefile
index de77590..25d2d9c 100644
--- a/editors/AbiWord2/Makefile
+++ b/editors/AbiWord2/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: AbiWord
# Version required: 0.5.5
# Date created: 3 Mar 1999
-# Whom: Donald Burr <dburr@FreeBSD.ORG>
+# Whom: Donald Burr <dburr@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.abisource.com/downloads/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} expat.tar.gz \
unixfonts-0.5.4.tar.gz
-MAINTAINER= dburr@FreeBSD.ORG
+MAINTAINER= dburr@FreeBSD.org
BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash2
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile
index de77590..25d2d9c 100644
--- a/editors/abiword-devel/Makefile
+++ b/editors/abiword-devel/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: AbiWord
# Version required: 0.5.5
# Date created: 3 Mar 1999
-# Whom: Donald Burr <dburr@FreeBSD.ORG>
+# Whom: Donald Burr <dburr@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.abisource.com/downloads/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} expat.tar.gz \
unixfonts-0.5.4.tar.gz
-MAINTAINER= dburr@FreeBSD.ORG
+MAINTAINER= dburr@FreeBSD.org
BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash2
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index de77590..25d2d9c 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: AbiWord
# Version required: 0.5.5
# Date created: 3 Mar 1999
-# Whom: Donald Burr <dburr@FreeBSD.ORG>
+# Whom: Donald Burr <dburr@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.abisource.com/downloads/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} expat.tar.gz \
unixfonts-0.5.4.tar.gz
-MAINTAINER= dburr@FreeBSD.ORG
+MAINTAINER= dburr@FreeBSD.org
BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash2
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
diff --git a/editors/apel-emacs/Makefile b/editors/apel-emacs/Makefile
index b21cdf0..ac2a866 100644
--- a/editors/apel-emacs/Makefile
+++ b/editors/apel-emacs/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: apel for emacs
# Version required: 9.20
# Date created: 23 September 1998
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/apel/ \
ftp://ftp.center.osaka-u.ac.jp/mule/apel/
-MAINTAINER?= shige@FreeBSD.ORG
+MAINTAINER?= shige@FreeBSD.org
# distfile version
APEL_VER= 9.20
diff --git a/editors/apel-emacs20/Makefile b/editors/apel-emacs20/Makefile
index 5cf96d2..f6d0a75 100644
--- a/editors/apel-emacs20/Makefile
+++ b/editors/apel-emacs20/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: apel for emacs20
# Version required: 9.20
# Date created: 22 September 1998
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/apel-mule/Makefile b/editors/apel-mule/Makefile
index 4ae5cc4..d9487bf 100644
--- a/editors/apel-mule/Makefile
+++ b/editors/apel-mule/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: apel for mule
# Version required: 9.20
# Date created: 23 September 1998
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/apel-xemacs/Makefile b/editors/apel-xemacs/Makefile
index f0cc677..1442435 100644
--- a/editors/apel-xemacs/Makefile
+++ b/editors/apel-xemacs/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: apel for xemacs
# Version required: 9.19
# Date created: 13 June 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/apel-xemacs20/Makefile b/editors/apel-xemacs20/Makefile
index 4d6c334..1f5904f 100644
--- a/editors/apel-xemacs20/Makefile
+++ b/editors/apel-xemacs20/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: apel for xemacs20
# Version required: 9.19
# Date created: 13 June 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/apel-xemacs21-mule/Makefile b/editors/apel-xemacs21-mule/Makefile
index 37742dc..2fcb7ca 100644
--- a/editors/apel-xemacs21-mule/Makefile
+++ b/editors/apel-xemacs21-mule/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: apel for xemacs-mule
# Version required: 9.20
# Date created: 13 June 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/apel/Makefile b/editors/apel/Makefile
index b21cdf0..ac2a866 100644
--- a/editors/apel/Makefile
+++ b/editors/apel/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: apel for emacs
# Version required: 9.20
# Date created: 23 September 1998
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.etl.go.jp/pub/mule/apel/ \
ftp://ftp.center.osaka-u.ac.jp/mule/apel/
-MAINTAINER?= shige@FreeBSD.ORG
+MAINTAINER?= shige@FreeBSD.org
# distfile version
APEL_VER= 9.20
diff --git a/editors/beav/Makefile b/editors/beav/Makefile
index cedea16..1c316c4 100644
--- a/editors/beav/Makefile
+++ b/editors/beav/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: beav
# Version required: 1.40-13 (debian)
# Date created: 01 July 1995
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= beav-1.40.13
CATEGORIES= editors
MASTER_SITES= ftp://ftp.debian.org/debian/dists/stable/main/source/editors/
-MAINTAINER= jseger@FreeBSD.ORG
+MAINTAINER= jseger@FreeBSD.org
MAN1= beav.1
WRKSRC= ${WRKDIR}/beav-1.40
diff --git a/editors/custom-emacs/Makefile b/editors/custom-emacs/Makefile
index dc605ba..931a0a8 100644
--- a/editors/custom-emacs/Makefile
+++ b/editors/custom-emacs/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.dina.kvl.dk/pub/Staff/Per.Abrahamsen/custom/ \
ftp://ftp.win.ne.jp/pub/word/elisp/
-MAINTAINER?= shige@FreeBSD.ORG
+MAINTAINER?= shige@FreeBSD.org
# custom library
CUSTOM_VER= 1.9962
diff --git a/editors/custom-mule/Makefile b/editors/custom-mule/Makefile
index 751c29e..963ee3b 100644
--- a/editors/custom-mule/Makefile
+++ b/editors/custom-mule/Makefile
@@ -6,7 +6,7 @@
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
PATCHFILES= custom-1.9962.patch
PATCH_SITES= ftp://ftp.jpl.org/pub/elisp/semi-gnus-mule23@1934/
diff --git a/editors/e93/Makefile b/editors/e93/Makefile
index ca87900..512c502 100644
--- a/editors/e93/Makefile
+++ b/editors/e93/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= editors tcl80
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= editors
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= tcl80.1:${PORTSDIR}/lang/tcl80
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index d3ce917..cf00be6 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= emacs
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
Y2K= http://www.gnu.org/software/year2000.html
diff --git a/editors/emacs19/Makefile b/editors/emacs19/Makefile
index d3ce917..cf00be6 100644
--- a/editors/emacs19/Makefile
+++ b/editors/emacs19/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= emacs
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
Y2K= http://www.gnu.org/software/year2000.html
diff --git a/editors/emacs20-dl/Makefile b/editors/emacs20-dl/Makefile
index 24ec493..79e76d9 100644
--- a/editors/emacs20-dl/Makefile
+++ b/editors/emacs20-dl/Makefile
@@ -16,7 +16,7 @@ PATCH_SITES= http://www.etl.go.jp/~tomo/comp/emacsen/
PATCHFILES= emacs-20.4-dl.diff.gz
PATCH_DIST_STRIP= -p1
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
RUN_DEPENDS= emacs-20.4:${PORTSDIR}/editors/emacs20
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index d3ce917..cf00be6 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= emacs
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
Y2K= http://www.gnu.org/software/year2000.html
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile
index d3ce917..cf00be6 100644
--- a/editors/emacs23/Makefile
+++ b/editors/emacs23/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= emacs
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
Y2K= http://www.gnu.org/software/year2000.html
diff --git a/editors/flim-emacs-current/Makefile b/editors/flim-emacs-current/Makefile
index 6261a80..7ec041e 100644
--- a/editors/flim-emacs-current/Makefile
+++ b/editors/flim-emacs-current/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: flim for emacs
# Version required: 1.12.5
# Date created: 9 May 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= flim-${FLIM_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.jaist.ac.jp/pub/GNU/elisp/flim/flim-1.12/
-MAINTAINER?= shige@FreeBSD.ORG
+MAINTAINER?= shige@FreeBSD.org
PORTCLASS?= master
diff --git a/editors/flim-emacs/Makefile b/editors/flim-emacs/Makefile
index d0aff7e..a980275 100644
--- a/editors/flim-emacs/Makefile
+++ b/editors/flim-emacs/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: flim for emacs
# Version required: 1.9.2
# Date created: 9 May 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= flim-${FLIM_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.jaist.ac.jp/pub/GNU/elisp/flim/flim-1.09/
-MAINTAINER?= shige@FreeBSD.ORG
+MAINTAINER?= shige@FreeBSD.org
PORTCLASS?= master
diff --git a/editors/flim-emacs20-current/Makefile b/editors/flim-emacs20-current/Makefile
index 9a9c4e5..ea51f29 100644
--- a/editors/flim-emacs20-current/Makefile
+++ b/editors/flim-emacs20-current/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: flim-current for emacs20
# Version required: 1.12.5
# Date created: 23 September 1998
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/flim-emacs20/Makefile b/editors/flim-emacs20/Makefile
index 2a27982..2b0f94d 100644
--- a/editors/flim-emacs20/Makefile
+++ b/editors/flim-emacs20/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: flim for emacs20
# Version required: 1.9.2
# Date created: 23 September 1998
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/flim-mule-current/Makefile b/editors/flim-mule-current/Makefile
index 56783b5..a2713d1 100644
--- a/editors/flim-mule-current/Makefile
+++ b/editors/flim-mule-current/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: flim for mule
# Version required: 1.12.5
# Date created: 9 May 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/flim-mule/Makefile b/editors/flim-mule/Makefile
index 9befab5..9308085 100644
--- a/editors/flim-mule/Makefile
+++ b/editors/flim-mule/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: flim for mule
# Version required: 1.9.2
# Date created: 9 May 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/flim-xemacs-current/Makefile b/editors/flim-xemacs-current/Makefile
index b0d167d..61778eb 100644
--- a/editors/flim-xemacs-current/Makefile
+++ b/editors/flim-xemacs-current/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: flim for xemacs
# Version required: 1.12.5
# Date created: 25 July 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/flim-xemacs/Makefile b/editors/flim-xemacs/Makefile
index b512ba8..0172a98 100644
--- a/editors/flim-xemacs/Makefile
+++ b/editors/flim-xemacs/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: flim for xemacs
# Version required: 1.9.2
# Date created: 25 July 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/flim-xemacs20-current/Makefile b/editors/flim-xemacs20-current/Makefile
index b11f3e8..6ebf79d 100644
--- a/editors/flim-xemacs20-current/Makefile
+++ b/editors/flim-xemacs20-current/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: flim for xemacs20
# Version required: 1.12.5
# Date created: 25 July 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/flim-xemacs20/Makefile b/editors/flim-xemacs20/Makefile
index e9d2884..24cd9cd 100644
--- a/editors/flim-xemacs20/Makefile
+++ b/editors/flim-xemacs20/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: flim for xemacs20
# Version required: 1.9.2
# Date created: 25 July 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/flim-xemacs21-mule-current/Makefile b/editors/flim-xemacs21-mule-current/Makefile
index db9c51b..df14685 100644
--- a/editors/flim-xemacs21-mule-current/Makefile
+++ b/editors/flim-xemacs21-mule-current/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: flim for xemacs-mule
# Version required: 1.12.5
# Date created: 25 July 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/flim-xemacs21-mule/Makefile b/editors/flim-xemacs21-mule/Makefile
index 6b2e4bb..3ae08ea 100644
--- a/editors/flim-xemacs21-mule/Makefile
+++ b/editors/flim-xemacs21-mule/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: flim for xemacs-mule
# Version required: 1.9.2
# Date created: 25 July 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/flim/Makefile b/editors/flim/Makefile
index 6261a80..7ec041e 100644
--- a/editors/flim/Makefile
+++ b/editors/flim/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: flim for emacs
# Version required: 1.12.5
# Date created: 9 May 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= flim-${FLIM_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.jaist.ac.jp/pub/GNU/elisp/flim/flim-1.12/
-MAINTAINER?= shige@FreeBSD.ORG
+MAINTAINER?= shige@FreeBSD.org
PORTCLASS?= master
diff --git a/editors/flim113-emacs/Makefile b/editors/flim113-emacs/Makefile
index 6261a80..7ec041e 100644
--- a/editors/flim113-emacs/Makefile
+++ b/editors/flim113-emacs/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: flim for emacs
# Version required: 1.12.5
# Date created: 9 May 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= flim-${FLIM_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.jaist.ac.jp/pub/GNU/elisp/flim/flim-1.12/
-MAINTAINER?= shige@FreeBSD.ORG
+MAINTAINER?= shige@FreeBSD.org
PORTCLASS?= master
diff --git a/editors/flim113-emacs20/Makefile b/editors/flim113-emacs20/Makefile
index 9a9c4e5..ea51f29 100644
--- a/editors/flim113-emacs20/Makefile
+++ b/editors/flim113-emacs20/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: flim-current for emacs20
# Version required: 1.12.5
# Date created: 23 September 1998
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/flim113-mule/Makefile b/editors/flim113-mule/Makefile
index 56783b5..a2713d1 100644
--- a/editors/flim113-mule/Makefile
+++ b/editors/flim113-mule/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: flim for mule
# Version required: 1.12.5
# Date created: 9 May 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/flim113-xemacs/Makefile b/editors/flim113-xemacs/Makefile
index b0d167d..61778eb 100644
--- a/editors/flim113-xemacs/Makefile
+++ b/editors/flim113-xemacs/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: flim for xemacs
# Version required: 1.12.5
# Date created: 25 July 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/flim113-xemacs20/Makefile b/editors/flim113-xemacs20/Makefile
index b11f3e8..6ebf79d 100644
--- a/editors/flim113-xemacs20/Makefile
+++ b/editors/flim113-xemacs20/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: flim for xemacs20
# Version required: 1.12.5
# Date created: 25 July 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/flim113-xemacs21-mule/Makefile b/editors/flim113-xemacs21-mule/Makefile
index db9c51b..df14685 100644
--- a/editors/flim113-xemacs21-mule/Makefile
+++ b/editors/flim113-xemacs21-mule/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: flim for xemacs-mule
# Version required: 1.12.5
# Date created: 25 July 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/flim113/Makefile b/editors/flim113/Makefile
index 6261a80..7ec041e 100644
--- a/editors/flim113/Makefile
+++ b/editors/flim113/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: flim for emacs
# Version required: 1.12.5
# Date created: 9 May 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= flim-${FLIM_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.jaist.ac.jp/pub/GNU/elisp/flim/flim-1.12/
-MAINTAINER?= shige@FreeBSD.ORG
+MAINTAINER?= shige@FreeBSD.org
PORTCLASS?= master
diff --git a/editors/flim114-emacs20/Makefile b/editors/flim114-emacs20/Makefile
index 6261a80..7ec041e 100644
--- a/editors/flim114-emacs20/Makefile
+++ b/editors/flim114-emacs20/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: flim for emacs
# Version required: 1.12.5
# Date created: 9 May 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= flim-${FLIM_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.jaist.ac.jp/pub/GNU/elisp/flim/flim-1.12/
-MAINTAINER?= shige@FreeBSD.ORG
+MAINTAINER?= shige@FreeBSD.org
PORTCLASS?= master
diff --git a/editors/joe-devel/Makefile b/editors/joe-devel/Makefile
index 13963fe..a6e533a 100644
--- a/editors/joe-devel/Makefile
+++ b/editors/joe-devel/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: joe
# Version required: 2.8
# Date created: 01 Jul 1995
-# Whom: torstenb@FreeBSD.ORG
+# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index 13963fe..a6e533a 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: joe
# Version required: 2.8
# Date created: 01 Jul 1995
-# Whom: torstenb@FreeBSD.ORG
+# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
diff --git a/editors/joe2/Makefile b/editors/joe2/Makefile
index 13963fe..a6e533a 100644
--- a/editors/joe2/Makefile
+++ b/editors/joe2/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: joe
# Version required: 2.8
# Date created: 01 Jul 1995
-# Whom: torstenb@FreeBSD.ORG
+# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
diff --git a/editors/jove/Makefile b/editors/jove/Makefile
index d388b91..b4fe3be 100644
--- a/editors/jove/Makefile
+++ b/editors/jove/Makefile
@@ -10,7 +10,7 @@ DISTNAME= jove-4.16
CATEGORIES= editors
MASTER_SITES= ftp://relay.cs.toronto.edu/pub/moraes/jove/
-MAINTAINER= erich@FreeBSD.ORG
+MAINTAINER= erich@FreeBSD.org
WRKSRC= ${WRKDIR}/jove
MAN1= jove.1 teachjove.1 xjove.1 jovetool.1
diff --git a/editors/leim20/Makefile b/editors/leim20/Makefile
index 4ff4a45..4c329a1 100644
--- a/editors/leim20/Makefile
+++ b/editors/leim20/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= emacs
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
BUILD_DEPENDS= emacs-20.4:${PORTSDIR}/editors/emacs20
RUN_DEPENDS= emacs-20.4:${PORTSDIR}/editors/emacs20
diff --git a/editors/psgml-emacs/Makefile b/editors/psgml-emacs/Makefile
index ea0dab0..d5c06d1 100644
--- a/editors/psgml-emacs/Makefile
+++ b/editors/psgml-emacs/Makefile
@@ -10,7 +10,7 @@ DISTNAME= psgml-1.1.6
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.lysator.liu.se/pub/sgml/ALPHA/
-MAINTAINER?= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# distfile version
PSGML_VER= 1.1.6
diff --git a/editors/psgml-emacs20/Makefile b/editors/psgml-emacs20/Makefile
index b0ea0c3..032a4eb 100644
--- a/editors/psgml-emacs20/Makefile
+++ b/editors/psgml-emacs20/Makefile
@@ -6,7 +6,7 @@
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/psgml-mule/Makefile b/editors/psgml-mule/Makefile
index 68b5884..693e8f0 100644
--- a/editors/psgml-mule/Makefile
+++ b/editors/psgml-mule/Makefile
@@ -6,7 +6,7 @@
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/psgml-xemacs21-mule/Makefile b/editors/psgml-xemacs21-mule/Makefile
index e51d1ae..0c6b00e 100644
--- a/editors/psgml-xemacs21-mule/Makefile
+++ b/editors/psgml-xemacs21-mule/Makefile
@@ -6,7 +6,7 @@
# $FreeBSD$
#
-MAINTAINER= kuriyama@FreeBSD.ORG
+MAINTAINER= kuriyama@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/psgml/Makefile b/editors/psgml/Makefile
index ea0dab0..d5c06d1 100644
--- a/editors/psgml/Makefile
+++ b/editors/psgml/Makefile
@@ -10,7 +10,7 @@ DISTNAME= psgml-1.1.6
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.lysator.liu.se/pub/sgml/ALPHA/
-MAINTAINER?= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# distfile version
PSGML_VER= 1.1.6
diff --git a/editors/semi-emacs-current/Makefile b/editors/semi-emacs-current/Makefile
index e43ab75..ad0bf28 100644
--- a/editors/semi-emacs-current/Makefile
+++ b/editors/semi-emacs-current/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: semi-current for emacs
# Version required: 1.13.3
# Date created: 9 May 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= semi-${SEMI_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.jaist.ac.jp/pub/GNU/elisp/semi/semi-1.13-for-flim-1.12/
-MAINTAINER?= shige@FreeBSD.ORG
+MAINTAINER?= shige@FreeBSD.org
PORTCLASS?= master
diff --git a/editors/semi-emacs/Makefile b/editors/semi-emacs/Makefile
index fcda1dc..dd49992 100644
--- a/editors/semi-emacs/Makefile
+++ b/editors/semi-emacs/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: semi for emacs
# Version required: 1.8.6
# Date created: 9 May 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= semi-${SEMI_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.jaist.ac.jp/pub/GNU/elisp/semi/semi-1.08-for-flim-1.9/
-MAINTAINER?= shige@FreeBSD.ORG
+MAINTAINER?= shige@FreeBSD.org
PORTCLASS?= master
diff --git a/editors/semi-emacs20-current/Makefile b/editors/semi-emacs20-current/Makefile
index b1d8228..2c7514f 100644
--- a/editors/semi-emacs20-current/Makefile
+++ b/editors/semi-emacs20-current/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: semi-current for emacs20
# Version required: 1.13.3
# Date created: 23 September 1998
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/semi-emacs20/Makefile b/editors/semi-emacs20/Makefile
index ba8bf8b..ec1a80c 100644
--- a/editors/semi-emacs20/Makefile
+++ b/editors/semi-emacs20/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: semi for emacs
# Version required: 1.8.6
# Date created: 23 September 1998
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/semi-mule-current/Makefile b/editors/semi-mule-current/Makefile
index aee6a32..da20b63 100644
--- a/editors/semi-mule-current/Makefile
+++ b/editors/semi-mule-current/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: semi-current for mule
# Version required: 1.13.3
# Date created: 9 May 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/semi-mule/Makefile b/editors/semi-mule/Makefile
index f14c1b8..7753626 100644
--- a/editors/semi-mule/Makefile
+++ b/editors/semi-mule/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: semi for mule
# Version required: 1.8.6
# Date created: 9 May 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/semi-xemacs-current/Makefile b/editors/semi-xemacs-current/Makefile
index 91b9241..8cfee51 100644
--- a/editors/semi-xemacs-current/Makefile
+++ b/editors/semi-xemacs-current/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: semi-current for xemacs
# Version required: 1.13.3
# Date created: 25 July 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/semi-xemacs/Makefile b/editors/semi-xemacs/Makefile
index cbe4ece..46ea7a6 100644
--- a/editors/semi-xemacs/Makefile
+++ b/editors/semi-xemacs/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: semi for xemacs
# Version required: 1.8.6
# Date created: 25 July 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/semi-xemacs20-current/Makefile b/editors/semi-xemacs20-current/Makefile
index 2b30a31..1aaaa04 100644
--- a/editors/semi-xemacs20-current/Makefile
+++ b/editors/semi-xemacs20-current/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: semi-current for xemacs20
# Version required: 1.13.3
# Date created: 25 July 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/semi-xemacs20/Makefile b/editors/semi-xemacs20/Makefile
index a96d274..6fa5c70 100644
--- a/editors/semi-xemacs20/Makefile
+++ b/editors/semi-xemacs20/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: semi for xemacs20
# Version required: 1.8.6
# Date created: 25 July 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/semi-xemacs21-mule-current/Makefile b/editors/semi-xemacs21-mule-current/Makefile
index 032e539..9157f27 100644
--- a/editors/semi-xemacs21-mule-current/Makefile
+++ b/editors/semi-xemacs21-mule-current/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: semi-current for xemacs-mule
# Version required: 1.13.3
# Date created: 25 July 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/semi-xemacs21-mule/Makefile b/editors/semi-xemacs21-mule/Makefile
index a317b07..32e0adb 100644
--- a/editors/semi-xemacs21-mule/Makefile
+++ b/editors/semi-xemacs21-mule/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: semi for xemacs-mule
# Version required: 1.8.6
# Date created: 25 July 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/semi/Makefile b/editors/semi/Makefile
index e43ab75..ad0bf28 100644
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: semi-current for emacs
# Version required: 1.13.3
# Date created: 9 May 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= semi-${SEMI_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.jaist.ac.jp/pub/GNU/elisp/semi/semi-1.13-for-flim-1.12/
-MAINTAINER?= shige@FreeBSD.ORG
+MAINTAINER?= shige@FreeBSD.org
PORTCLASS?= master
diff --git a/editors/semi113-emacs/Makefile b/editors/semi113-emacs/Makefile
index e43ab75..ad0bf28 100644
--- a/editors/semi113-emacs/Makefile
+++ b/editors/semi113-emacs/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: semi-current for emacs
# Version required: 1.13.3
# Date created: 9 May 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= semi-${SEMI_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.jaist.ac.jp/pub/GNU/elisp/semi/semi-1.13-for-flim-1.12/
-MAINTAINER?= shige@FreeBSD.ORG
+MAINTAINER?= shige@FreeBSD.org
PORTCLASS?= master
diff --git a/editors/semi113-emacs20/Makefile b/editors/semi113-emacs20/Makefile
index b1d8228..2c7514f 100644
--- a/editors/semi113-emacs20/Makefile
+++ b/editors/semi113-emacs20/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: semi-current for emacs20
# Version required: 1.13.3
# Date created: 23 September 1998
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/semi113-mule/Makefile b/editors/semi113-mule/Makefile
index aee6a32..da20b63 100644
--- a/editors/semi113-mule/Makefile
+++ b/editors/semi113-mule/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: semi-current for mule
# Version required: 1.13.3
# Date created: 9 May 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/semi113-xemacs/Makefile b/editors/semi113-xemacs/Makefile
index 91b9241..8cfee51 100644
--- a/editors/semi113-xemacs/Makefile
+++ b/editors/semi113-xemacs/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: semi-current for xemacs
# Version required: 1.13.3
# Date created: 25 July 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/semi113-xemacs20/Makefile b/editors/semi113-xemacs20/Makefile
index 2b30a31..1aaaa04 100644
--- a/editors/semi113-xemacs20/Makefile
+++ b/editors/semi113-xemacs20/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: semi-current for xemacs20
# Version required: 1.13.3
# Date created: 25 July 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/semi113-xemacs21-mule/Makefile b/editors/semi113-xemacs21-mule/Makefile
index 032e539..9157f27 100644
--- a/editors/semi113-xemacs21-mule/Makefile
+++ b/editors/semi113-xemacs21-mule/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: semi-current for xemacs-mule
# Version required: 1.13.3
# Date created: 25 July 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/semi113/Makefile b/editors/semi113/Makefile
index e43ab75..ad0bf28 100644
--- a/editors/semi113/Makefile
+++ b/editors/semi113/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: semi-current for emacs
# Version required: 1.13.3
# Date created: 9 May 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= semi-${SEMI_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.jaist.ac.jp/pub/GNU/elisp/semi/semi-1.13-for-flim-1.12/
-MAINTAINER?= shige@FreeBSD.ORG
+MAINTAINER?= shige@FreeBSD.org
PORTCLASS?= master
diff --git a/editors/semi114-emacs20/Makefile b/editors/semi114-emacs20/Makefile
index e43ab75..ad0bf28 100644
--- a/editors/semi114-emacs20/Makefile
+++ b/editors/semi114-emacs20/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: semi-current for emacs
# Version required: 1.13.3
# Date created: 9 May 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= semi-${SEMI_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.jaist.ac.jp/pub/GNU/elisp/semi/semi-1.13-for-flim-1.12/
-MAINTAINER?= shige@FreeBSD.ORG
+MAINTAINER?= shige@FreeBSD.org
PORTCLASS?= master
diff --git a/editors/wemi-emacs-current/Makefile b/editors/wemi-emacs-current/Makefile
index df4b10a..be95c7d 100644
--- a/editors/wemi-emacs-current/Makefile
+++ b/editors/wemi-emacs-current/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: wemi-current for emacs
# Version required: 1.13.3
# Date created: 9 May 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= wemi-${WEMI_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.jaist.ac.jp/pub/GNU/elisp/semi/wemi/
-MAINTAINER?= shige@FreeBSD.ORG
+MAINTAINER?= shige@FreeBSD.org
PORTCLASS?= master
diff --git a/editors/wemi-emacs/Makefile b/editors/wemi-emacs/Makefile
index 16d18f5..cb2d148 100644
--- a/editors/wemi-emacs/Makefile
+++ b/editors/wemi-emacs/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: wemi for emacs
# Version required: 1.8.6
# Date created: 9 May 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= wemi-${WEMI_VER}
CATEGORIES= editors elisp
MASTER_SITES= ftp://ftp.jaist.ac.jp/pub/GNU/elisp/semi/semi-1.08-for-flim-1.9/
-MAINTAINER?= shige@FreeBSD.ORG
+MAINTAINER?= shige@FreeBSD.org
PORTCLASS?= master
diff --git a/editors/wemi-emacs20-current/Makefile b/editors/wemi-emacs20-current/Makefile
index efb92fd..bd6c737 100644
--- a/editors/wemi-emacs20-current/Makefile
+++ b/editors/wemi-emacs20-current/Makefile
@@ -6,7 +6,7 @@
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/wemi-emacs20/Makefile b/editors/wemi-emacs20/Makefile
index 97e7e83..9b12299 100644
--- a/editors/wemi-emacs20/Makefile
+++ b/editors/wemi-emacs20/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wemi for emacs20
# Version required: 1.8.6
# Date created: 23 September 1998
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/wemi-mule-current/Makefile b/editors/wemi-mule-current/Makefile
index 6a78ad4..934a805 100644
--- a/editors/wemi-mule-current/Makefile
+++ b/editors/wemi-mule-current/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wemi-current for mule
# Version required: 1.13.3
# Date created: 9 May 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/wemi-mule/Makefile b/editors/wemi-mule/Makefile
index f0627b8..4609054 100644
--- a/editors/wemi-mule/Makefile
+++ b/editors/wemi-mule/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wemi for mule
# Version required: 1.8.6
# Date created: 9 May 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/wemi-xemacs-current/Makefile b/editors/wemi-xemacs-current/Makefile
index a83b6c5..38705d6 100644
--- a/editors/wemi-xemacs-current/Makefile
+++ b/editors/wemi-xemacs-current/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wemi-current for xemacs
# Version required: 1.13.3
# Date created: 25 July 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/wemi-xemacs/Makefile b/editors/wemi-xemacs/Makefile
index b5d1dc0..f5d6d9f 100644
--- a/editors/wemi-xemacs/Makefile
+++ b/editors/wemi-xemacs/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wemi for xemacs
# Version required: 1.8.6
# Date created: 25 July 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/wemi-xemacs20-current/Makefile b/editors/wemi-xemacs20-current/Makefile
index 5a7547e..7194a96 100644
--- a/editors/wemi-xemacs20-current/Makefile
+++ b/editors/wemi-xemacs20-current/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wemi-current for xemacs20
# Version required: 1.13.3
# Date created: 25 July 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/wemi-xemacs20/Makefile b/editors/wemi-xemacs20/Makefile
index f070955..10ec47b 100644
--- a/editors/wemi-xemacs20/Makefile
+++ b/editors/wemi-xemacs20/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wemi for xemacs20
# Version required: 1.8.6
# Date created: 25 July 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/wemi-xemacs21-mule-current/Makefile b/editors/wemi-xemacs21-mule-current/Makefile
index 988bd8c..43220c0 100644
--- a/editors/wemi-xemacs21-mule-current/Makefile
+++ b/editors/wemi-xemacs21-mule-current/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wemi-current for xemacs-mule
# Version required: 1.13.3
# Date created: 25 July 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/wemi-xemacs21-mule/Makefile b/editors/wemi-xemacs21-mule/Makefile
index 324596b7..b22c002 100644
--- a/editors/wemi-xemacs21-mule/Makefile
+++ b/editors/wemi-xemacs21-mule/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wemi for xemacs-mule
# Version required: 1.8.6
# Date created: 25 July 1999
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/xcoral/Makefile b/editors/xcoral/Makefile
index 9b77d6b..578b199 100644
--- a/editors/xcoral/Makefile
+++ b/editors/xcoral/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= editors
-MAINTAINER= erich@FreeBSD.ORG
+MAINTAINER= erich@FreeBSD.org
USE_X_PREFIX= yes
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index d254c74..57e50aa 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -14,7 +14,7 @@ DISTNAME= bochs-${DATE}a
CATEGORIES= emulators
MASTER_SITES= ftp://ftp.bochs.com/pub/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
USE_XLIB= yes
GNU_CONFIGURE= YES
diff --git a/emulators/hfsutils/Makefile b/emulators/hfsutils/Makefile
index 5133354..745004e 100644
--- a/emulators/hfsutils/Makefile
+++ b/emulators/hfsutils/Makefile
@@ -10,7 +10,7 @@ DISTNAME= hfsutils-3.2.6
CATEGORIES= emulators tk80
MASTER_SITES= ftp://ftp.mars.org/pub/hfs/
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
diff --git a/emulators/sim/Makefile b/emulators/sim/Makefile
index c1dc61c..df4f82b 100644
--- a/emulators/sim/Makefile
+++ b/emulators/sim/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= emulators
MASTER_SITES= ftp://minnie.cs.adfa.oz.au/pub/PDP-11/Sims/Supnik_2.3/sources/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}.update1.tar.gz
-MAINTAINER= jraynard@FreeBSD.ORG
+MAINTAINER= jraynard@FreeBSD.org
RESTRICTED= "Non-commercial use only"
diff --git a/emulators/sim6811/Makefile b/emulators/sim6811/Makefile
index a187b3e..9f9dbaa 100644
--- a/emulators/sim6811/Makefile
+++ b/emulators/sim6811/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= emulators
MASTER_SITES= ftp://crl.nmsu.edu/pub/non-lexical/6811/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= erich@FreeBSD.ORG
+MAINTAINER= erich@FreeBSD.org
NO_WRKSUBDIR= yes
diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile
index c1dc61c..df4f82b 100644
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= emulators
MASTER_SITES= ftp://minnie.cs.adfa.oz.au/pub/PDP-11/Sims/Supnik_2.3/sources/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}.update1.tar.gz
-MAINTAINER= jraynard@FreeBSD.ORG
+MAINTAINER= jraynard@FreeBSD.org
RESTRICTED= "Non-commercial use only"
diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index b83dcbe..eba187e 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: stella-1.1
# Version required: 1.1
# Date created: March 4, 1999
-# Whom: Jacques Vidrine <nectar@FreeBSD.ORG>
+# Whom: Jacques Vidrine <nectar@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= emulators
MASTER_SITES= ftp://ftp.eos.ncsu.edu/pub/bsvc/stella/1.1/ \
http://www.nectar.com/distfiles/
-MAINTAINER= nectar@FreeBSD.ORG
+MAINTAINER= nectar@FreeBSD.org
USE_XLIB= yes
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 12ec7da..1c45909 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -13,7 +13,7 @@ CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= ALPHA/wine/development
-MAINTAINER= se@FreeBSD.ORG
+MAINTAINER= se@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 12ec7da..1c45909 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -13,7 +13,7 @@ CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= ALPHA/wine/development
-MAINTAINER= se@FreeBSD.ORG
+MAINTAINER= se@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 0a76c18..4306b87 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: xmame
# Version required: 0.33b6.1
# Date created: 8 Feb 1998
-# Whom: Donald Burr <dburr@FreeBSD.ORG>
+# Whom: Donald Burr <dburr@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= emulators
MASTER_SITES= ftp://drake.dit.upm.es/xmame/ftpsite/
EXTRACT_SUFX= .tgz
-MAINTAINER= dburr@FreeBSD.ORG
+MAINTAINER= dburr@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/finance/p5-Business-CreditCard/Makefile b/finance/p5-Business-CreditCard/Makefile
index f73a24f..977c3b0 100644
--- a/finance/p5-Business-CreditCard/Makefile
+++ b/finance/p5-Business-CreditCard/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= misc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Business
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/ftp/axyftp/Makefile b/ftp/axyftp/Makefile
index 0f835b9..62b6120 100644
--- a/ftp/axyftp/Makefile
+++ b/ftp/axyftp/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.wxftp.seul.org/pub/wxftp/0.4.4/ \
ftp://ftp.sunsite.auc.dk/disk2/linuxberg.com/files/x11/network/ \
ftp://ftp.bitcon.no/.10/linux/linuxberg/files/x11/network/
-MAINTAINER= kris@FreeBSD.ORG
+MAINTAINER= kris@FreeBSD.org
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index d45704f..2ca79b6 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://www.fts.frontec.se/~dast/stuff/ \
ftp://ftp.win.or.jp/pub/network/www/misc/ \
ftp://crydee.sai.msu.ru/zeus/unix/WWW/tools/mirror/
-MAINTAINER= kris@FreeBSD.ORG
+MAINTAINER= kris@FreeBSD.org
.if defined(USE_SSL)
BUILD_DEPENDS= ${PREFIX}/lib/libssl.a:${PORTSDIR}/security/openssl \
diff --git a/ftp/gtm/Makefile b/ftp/gtm/Makefile
index 651873f..9c3e792 100644
--- a/ftp/gtm/Makefile
+++ b/ftp/gtm/Makefile
@@ -1,7 +1,7 @@
# Ports collection Makefile for: gtm
# Version required: 0.3.1
# Date created: 05/28/1999
-# Whom: nectar@FreeBSD.ORG
+# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= ftp gnome
MASTER_SITES= http://www.rnl.ist.utl.pt/~bapm/gtm/files/ \
http://www.nectar.cc/distfiles/
-MAINTAINER= nectar@FreeBSD.ORG
+MAINTAINER= nectar@FreeBSD.org
# wget is in BUILD_DEPENDS because the configure script checks for it
LIB_DEPENDS= gnome.2:${PORTSDIR}/x11/gnomelibs
diff --git a/ftp/llnlxdir/Makefile b/ftp/llnlxdir/Makefile
index dee2cfd..94a1693 100644
--- a/ftp/llnlxdir/Makefile
+++ b/ftp/llnlxdir/Makefile
@@ -2,7 +2,7 @@
# Version required: 2.0
# Date created: 9 November 1997
#
-# Whom: Dima Ruban <dima@FreeBSD.ORG>
+# Whom: Dima Ruban <dima@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ CATEGORIES= ftp
MASTER_SITES= ftp://ftp-lc.llnl.gov/pub/ia/llnlxdir/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= dima@FreeBSD.ORG
+MAINTAINER= dima@FreeBSD.org
MAN1= xdir.1
diff --git a/ftp/llnlxftp/Makefile b/ftp/llnlxftp/Makefile
index fabb0f2..c9796ea 100644
--- a/ftp/llnlxftp/Makefile
+++ b/ftp/llnlxftp/Makefile
@@ -2,7 +2,7 @@
# Version required: 2.1
# Date created: 9 November 1997
#
-# Whom: Dima Ruban <dima@FreeBSD.ORG>
+# Whom: Dima Ruban <dima@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ CATEGORIES= ftp
MASTER_SITES= ftp://ftp-lc.llnl.gov/pub/ia/llnlxftp/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= dima@FreeBSD.ORG
+MAINTAINER= dima@FreeBSD.org
WRKSRC= ${WRKDIR}/llnlxftp2.1/sources
REQUIRES_MOTIF= yes
diff --git a/ftp/mirror/Makefile b/ftp/mirror/Makefile
index 43a0ca2..d3790c9 100644
--- a/ftp/mirror/Makefile
+++ b/ftp/mirror/Makefile
@@ -10,7 +10,7 @@ DISTNAME= mirror-2.9
CATEGORIES= ftp
MASTER_SITES= ftp://src.doc.ic.ac.uk/computing/archiving/mirror/
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
USE_PERL5= yes
NO_WRKSUBDIR= yes
diff --git a/ftp/moxftp/Makefile b/ftp/moxftp/Makefile
index fd3f2fe..7547d10 100644
--- a/ftp/moxftp/Makefile
+++ b/ftp/moxftp/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://metalab.unc.edu/pub/X11/contrib/applications/ \
ftp://ftp.tk.mesh.ad.jp/pub/X/contrib/applications/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
REQUIRES_MOTIF= yes
GNU_CONFIGURE= yes
diff --git a/ftp/ncftp2/Makefile b/ftp/ncftp2/Makefile
index 422712b..9a50fb8 100644
--- a/ftp/ncftp2/Makefile
+++ b/ftp/ncftp2/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ncftp-2.4.3
CATEGORIES= ftp
MASTER_SITES= ftp://ftp.ncftp.com/ncftp/
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
GNU_CONFIGURE= yes
CONFIGURE_ENV= ac_cv_func_getmaxyx=yes ac_cv_lib_readline=yes
diff --git a/ftp/ncftp3/Makefile b/ftp/ncftp3/Makefile
index 9149abf..c48dc9f 100644
--- a/ftp/ncftp3/Makefile
+++ b/ftp/ncftp3/Makefile
@@ -12,7 +12,7 @@ PKGNAME= ncftp-3.0b19
CATEGORIES= ftp
MASTER_SITES= ftp://ftp.ncftp.com/ncftp/3.0BETA/
-MAINTAINER= obrien@FreeBSD.ORG
+MAINTAINER= obrien@FreeBSD.org
WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
GNU_CONFIGURE= yes
diff --git a/ftp/spegla/Makefile b/ftp/spegla/Makefile
index a48fec8..98b51ae 100644
--- a/ftp/spegla/Makefile
+++ b/ftp/spegla/Makefile
@@ -2,7 +2,7 @@
# New ports collection makefile for: spegla
# Version required: 0.93p2
# Date created: Sun Apr 19 16:17:25 PDT 1998
-# Whom: Jordan Hubbard <jkh@FreeBSD.ORG>
+# Whom: Jordan Hubbard <jkh@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/ftp/wget-devel/Makefile b/ftp/wget-devel/Makefile
index a6f31cf..22b0fba 100644
--- a/ftp/wget-devel/Makefile
+++ b/ftp/wget-devel/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: wget
# Version required: 1.5.3
# Date created: 31 December 1996
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -15,7 +15,7 @@ MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://ftp.max.irk.ru/unix/net/www/wget/
MASTER_SITE_SUBDIR= wget
-MAINTAINER= obrien@FreeBSD.ORG
+MAINTAINER= obrien@FreeBSD.org
LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
diff --git a/ftp/wget/Makefile b/ftp/wget/Makefile
index a6f31cf..22b0fba 100644
--- a/ftp/wget/Makefile
+++ b/ftp/wget/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: wget
# Version required: 1.5.3
# Date created: 31 December 1996
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -15,7 +15,7 @@ MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://ftp.max.irk.ru/unix/net/www/wget/
MASTER_SITE_SUBDIR= wget
-MAINTAINER= obrien@FreeBSD.ORG
+MAINTAINER= obrien@FreeBSD.org
LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
diff --git a/games/awele/Makefile b/games/awele/Makefile
index 61df390..81cbc56 100644
--- a/games/awele/Makefile
+++ b/games/awele/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: awele
# Version required: 1.0
# Date created: 01 May 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= games tk80
MASTER_SITES= http://www-rocq.inria.fr/air/ftp/Jean-Paul/
EXTRACT_SUFX= 1.0.tgz
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile
index 2eded22..3a2940b 100644
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@@ -17,7 +17,7 @@ MASTER_SITES= http://www.FreeBSD.org/~andreas/download/ \
DISTFILES= ${CF_SOURCES} ${CF_DOC} ${CF_MAPS} ${CF_SOUNDS} \
${CF_ARCH} ${CF_CLSERV}
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
BUILD_DEPENDS= rplay:${PORTSDIR}/audio/rplay
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index 2eded22..3a2940b 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -17,7 +17,7 @@ MASTER_SITES= http://www.FreeBSD.org/~andreas/download/ \
DISTFILES= ${CF_SOURCES} ${CF_DOC} ${CF_MAPS} ${CF_SOUNDS} \
${CF_ARCH} ${CF_CLSERV}
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
BUILD_DEPENDS= rplay:${PORTSDIR}/audio/rplay
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/games/crossfire/Makefile b/games/crossfire/Makefile
index 2eded22..3a2940b 100644
--- a/games/crossfire/Makefile
+++ b/games/crossfire/Makefile
@@ -17,7 +17,7 @@ MASTER_SITES= http://www.FreeBSD.org/~andreas/download/ \
DISTFILES= ${CF_SOURCES} ${CF_DOC} ${CF_MAPS} ${CF_SOUNDS} \
${CF_ARCH} ${CF_CLSERV}
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
BUILD_DEPENDS= rplay:${PORTSDIR}/audio/rplay
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/games/fkiss/Makefile b/games/fkiss/Makefile
index 4c3e8a1..738ae24 100644
--- a/games/fkiss/Makefile
+++ b/games/fkiss/Makefile
@@ -11,7 +11,7 @@ PKGNAME= fkiss-0.28
CATEGORIES= games
MASTER_SITES= http://www.oersted.co.jp/~yav/soft/fkiss/
-MAINTAINER= flathill@FreeBSD.ORG
+MAINTAINER= flathill@FreeBSD.org
RUN_DEPENDS= lha:${PORTSDIR}/archivers/lha
diff --git a/games/gnuchess/Makefile b/games/gnuchess/Makefile
index 6124f31..28439a1 100644
--- a/games/gnuchess/Makefile
+++ b/games/gnuchess/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= gnuchess
-MAINTAINER= markm@FreeBSD.ORG
+MAINTAINER= markm@FreeBSD.org
HAS_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/src
diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile
index b2ed890..57ee492 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -17,7 +17,7 @@ QT_PATCH= qnethack-3.2.2.1.0.1.src.tar.gz
QT_SOUND= nhs.tar.gz
DISTFILES= nethack-3.2.2.tar.gz ${QT_PATCH} ${QT_SOUND}
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
BUILD_DEPENDS= auplay:${PORTSDIR}/audio/nas \
xpmtoppm:${PORTSDIR}/graphics/netpbm
diff --git a/games/nethack/Makefile b/games/nethack/Makefile
index 4403d1c..4d4edb7 100644
--- a/games/nethack/Makefile
+++ b/games/nethack/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.wtower.com/nethack/sources/ \
${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= nethack
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/games/nethack3-tty/Makefile b/games/nethack3-tty/Makefile
index 4403d1c..4d4edb7 100644
--- a/games/nethack3-tty/Makefile
+++ b/games/nethack3-tty/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.wtower.com/nethack/sources/ \
${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= nethack
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/games/nethack3/Makefile b/games/nethack3/Makefile
index 4403d1c..4d4edb7 100644
--- a/games/nethack3/Makefile
+++ b/games/nethack3/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.wtower.com/nethack/sources/ \
${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= nethack
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/games/nethack32/Makefile b/games/nethack32/Makefile
index 4403d1c..4d4edb7 100644
--- a/games/nethack32/Makefile
+++ b/games/nethack32/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.wtower.com/nethack/sources/ \
${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= nethack
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/games/nethack33-nox11/Makefile b/games/nethack33-nox11/Makefile
index 4403d1c..4d4edb7 100644
--- a/games/nethack33-nox11/Makefile
+++ b/games/nethack33-nox11/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.wtower.com/nethack/sources/ \
${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= nethack
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/games/nethack33-qt/Makefile b/games/nethack33-qt/Makefile
index b2ed890..57ee492 100644
--- a/games/nethack33-qt/Makefile
+++ b/games/nethack33-qt/Makefile
@@ -17,7 +17,7 @@ QT_PATCH= qnethack-3.2.2.1.0.1.src.tar.gz
QT_SOUND= nhs.tar.gz
DISTFILES= nethack-3.2.2.tar.gz ${QT_PATCH} ${QT_SOUND}
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
BUILD_DEPENDS= auplay:${PORTSDIR}/audio/nas \
xpmtoppm:${PORTSDIR}/graphics/netpbm
diff --git a/games/nethack33/Makefile b/games/nethack33/Makefile
index 4403d1c..4d4edb7 100644
--- a/games/nethack33/Makefile
+++ b/games/nethack33/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.wtower.com/nethack/sources/ \
${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= nethack
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/games/nethack34-nox11/Makefile b/games/nethack34-nox11/Makefile
index 4403d1c..4d4edb7 100644
--- a/games/nethack34-nox11/Makefile
+++ b/games/nethack34-nox11/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.wtower.com/nethack/sources/ \
${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= nethack
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/games/nethack34-qt/Makefile b/games/nethack34-qt/Makefile
index b2ed890..57ee492 100644
--- a/games/nethack34-qt/Makefile
+++ b/games/nethack34-qt/Makefile
@@ -17,7 +17,7 @@ QT_PATCH= qnethack-3.2.2.1.0.1.src.tar.gz
QT_SOUND= nhs.tar.gz
DISTFILES= nethack-3.2.2.tar.gz ${QT_PATCH} ${QT_SOUND}
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
BUILD_DEPENDS= auplay:${PORTSDIR}/audio/nas \
xpmtoppm:${PORTSDIR}/graphics/netpbm
diff --git a/games/nethack34/Makefile b/games/nethack34/Makefile
index 4403d1c..4d4edb7 100644
--- a/games/nethack34/Makefile
+++ b/games/nethack34/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.wtower.com/nethack/sources/ \
${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= nethack
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/games/netrek-BRMH-bin/Makefile b/games/netrek-BRMH-bin/Makefile
index 6e2a1b9..1f78754 100644
--- a/games/netrek-BRMH-bin/Makefile
+++ b/games/netrek-BRMH-bin/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: netrek
# Version required: BRMH 2.2p2
# Date created: 15 Mar 1999
-# Whom: Donald Burr <dburr@FreeBSD.ORG>
+# Whom: Donald Burr <dburr@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= games
MASTER_SITES= ftp://ftp.solace.mh.se/pub/netrek/clients/bsd/
EXTRACT_SUFX= .gz
-MAINTAINER= dburr@FreeBSD.ORG
+MAINTAINER= dburr@FreeBSD.org
USE_X_PREFIX= YES
NO_BUILD= YES
diff --git a/games/netrek-COW3-bin/Makefile b/games/netrek-COW3-bin/Makefile
index c176dbd..ca6e81a 100644
--- a/games/netrek-COW3-bin/Makefile
+++ b/games/netrek-COW3-bin/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: netrek
# Version required: COW 3.00pl0
# Date created: 15 Mar 1999
-# Whom: Donald Burr <dburr@FreeBSD.ORG>
+# Whom: Donald Burr <dburr@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= games
MASTER_SITES= ftp://bigbang.astro.indiana.edu/pub/netrek/COW/COW-bin/
EXTRACT_SUFX= .gz
-MAINTAINER= dburr@FreeBSD.ORG
+MAINTAINER= dburr@FreeBSD.org
USE_X_PREFIX= YES
NO_BUILD= YES
diff --git a/games/pysol/Makefile b/games/pysol/Makefile
index 6c5dcbd..af4c24a 100644
--- a/games/pysol/Makefile
+++ b/games/pysol/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: PySol
# Version required: 2.14
# Date created: 11 September 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= games
MASTER_SITES= http://wildsau.idv.uni-linz.ac.at/mfx/download/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${CARDSETS}${EXTRACT_SUFX}
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
RUN_DEPENDS= python:${PORTSDIR}/lang/python
diff --git a/games/qcc/Makefile b/games/qcc/Makefile
index 985a38c..07febfb 100644
--- a/games/qcc/Makefile
+++ b/games/qcc/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: qcc
# Version required: 1.01
# Date created: October 25th 1996
-# Whom: jfitz@FreeBSD.ORG
+# Whom: jfitz@FreeBSD.org
#
# $FreeBSD$
#
diff --git a/games/quakeserver/Makefile b/games/quakeserver/Makefile
index 80b600b..bec0e66 100644
--- a/games/quakeserver/Makefile
+++ b/games/quakeserver/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: quakeserver
# Version required: 0.991
# Date created: October 26th 1996
-# Whom: jfitz@FreeBSD.ORG
+# Whom: jfitz@FreeBSD.org
#
# $FreeBSD$
#
diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile
index cb28853..d0a7be3 100644
--- a/games/rocksndiamonds/Makefile
+++ b/games/rocksndiamonds/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: rocksndiamonds
# Version required: 1.2.0
# Date created: 27 May 1999
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
USE_XLIB= yes
USE_GMAKE= yes
diff --git a/games/seahaven/Makefile b/games/seahaven/Makefile
index 9c683e7..0d4dcea 100644
--- a/games/seahaven/Makefile
+++ b/games/seahaven/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= games
MASTER_SITES= http://www.cinenet.net/users/spitzak/seahaven/
EXTRACT_SUFX= .tgz
-MAINTAINER= imp@FreeBSD.ORG
+MAINTAINER= imp@FreeBSD.org
USE_XLIB= yes
GNU_CONFIGURE= yes
diff --git a/games/spider/Makefile b/games/spider/Makefile
index b64f3a6..3c523c9 100644
--- a/games/spider/Makefile
+++ b/games/spider/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= games
MASTER_SITES= ftp://ftp.uni-koeln.de/windows/xcontrib/ \
http://www.lovett.com/~ade/FreeBSD/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
USE_IMAKE= yes
INSTALL_TARGET= install install.doc
diff --git a/games/tank/Makefile b/games/tank/Makefile
index 3aa84e0..c9ac17f 100644
--- a/games/tank/Makefile
+++ b/games/tank/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: tank
# Version required: 0.4a
# Date created: 4 Mar 1998
-# Whom: Donald Burr <dburr@FreeBSD.ORG>
+# Whom: Donald Burr <dburr@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= tank-0.4a
CATEGORIES= games
MASTER_SITES= http://step.polymtl.ca/~coyote/tank/
-MAINTAINER= dburr@FreeBSD.ORG
+MAINTAINER= dburr@FreeBSD.org
LIB_DEPENDS= MesaGL.14:${PORTSDIR}/graphics/Mesa3
diff --git a/games/tksol/Makefile b/games/tksol/Makefile
index b4671c5..3d5bae5 100644
--- a/games/tksol/Makefile
+++ b/games/tksol/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: tksol
# Version required: 1.0
# Date created: 26 June 1995
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= games tk80
MASTER_SITES= ftp://ftp.cs.umd.edu/pub/misc_software/tksol/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
diff --git a/games/uox3/Makefile b/games/uox3/Makefile
index d176f45..5398d5d 100644
--- a/games/uox3/Makefile
+++ b/games/uox3/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: uox3
# Version required: 0.69.02
# Date created: 24 Feb 1999
-# Whom: Donald Burr <dburr@FreeBSD.ORG>
+# Whom: Donald Burr <dburr@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://provolone.dynip.com/pub/ \
http://users.1st.net/magda/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} tqpsworld${EXTRACT_SUFX}
-MAINTAINER= dburr@FreeBSD.ORG
+MAINTAINER= dburr@FreeBSD.org
BROKEN= "Floating exception (core dumped)"
diff --git a/games/wmtimebomb/Makefile b/games/wmtimebomb/Makefile
index 4daaad0..0390f86 100644
--- a/games/wmtimebomb/Makefile
+++ b/games/wmtimebomb/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: wmtimebomb
# Version required: 0.2.0
# Date created: 10 August 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
@@ -10,7 +10,7 @@ PKGNAME= wmtimebomb-0.2.0
CATEGORIES= games windowmaker
MASTER_SITES= ftp://ftp.netmug.org/pub/FreeBSD/distfiles/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
PropList.1:${PORTSDIR}/devel/libPropList \
diff --git a/games/xbill/Makefile b/games/xbill/Makefile
index f880da8..891af50 100644
--- a/games/xbill/Makefile
+++ b/games/xbill/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games
EXTRACT_SUFX= .tgz
-MAINTAINER= obrien@FreeBSD.ORG
+MAINTAINER= obrien@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/games/xblast/Makefile b/games/xblast/Makefile
index 89a57c9..f944b21 100644
--- a/games/xblast/Makefile
+++ b/games/xblast/Makefile
@@ -15,7 +15,7 @@ CATEGORIES= games
# but right now only available from:
MASTER_SITES= http://www.ikp.uni-koeln.de/~vogel/archive/
-MAINTAINER= se@FreeBSD.ORG
+MAINTAINER= se@FreeBSD.org
WRKSRC= ${WRKDIR}/XBlast-2.6.beta
USE_IMAKE= yes
diff --git a/games/xbomb/Makefile b/games/xbomb/Makefile
index 959081e..728055a 100644
--- a/games/xbomb/Makefile
+++ b/games/xbomb/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: xbomb
# Version required: 2.1
# Date created: 20 Feb 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= games
MASTER_SITES= ftp://ftp.demon.co.uk/pub/unix/xwindows/games/
EXTRACT_SUFX= .tgz
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
USE_X_PREFIX= yes
MAN6= xbomb.6
diff --git a/games/xchadance/Makefile b/games/xchadance/Makefile
index c772895..9daeb69 100644
--- a/games/xchadance/Makefile
+++ b/games/xchadance/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: xchadance
# Version required: 1.0
# Date created: 21 August 1998
-# Whom: issei <issei@jp.FreeBSD.ORG>
+# Whom: issei <issei@jp.FreeBSD.org>
#
# $FreeBSD$
#
@@ -9,10 +9,10 @@
DISTNAME= xchada01
PKGNAME= xchadance-1.0
CATEGORIES= games
-MASTER_SITES= http://home.jp.FreeBSD.ORG/~issei/LOCAL_PORTS/
+MASTER_SITES= http://home.jp.FreeBSD.org/~issei/LOCAL_PORTS/
EXTRACT_SUFX= .lzh
-MAINTAINER= issei@jp.FreeBSD.ORG
+MAINTAINER= issei@jp.FreeBSD.org
BUILD_DEPENDS= lha:${PORTSDIR}/archivers/lha
diff --git a/games/xdemineur/Makefile b/games/xdemineur/Makefile
index 16ea0e0..f67b6e0 100644
--- a/games/xdemineur/Makefile
+++ b/games/xdemineur/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: xdemineur
# Version required: 2.1.1
# Date created: 13 Feb 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= xdemineur-2.1.1
CATEGORIES= games
MASTER_SITES= ftp://ftp.babafou.eu.org/pub/babafou/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/games/xemeraldia/Makefile b/games/xemeraldia/Makefile
index e55bca9..ed59dacd 100644
--- a/games/xemeraldia/Makefile
+++ b/games/xemeraldia/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= games
MASTER_SITES= ftp://ftp.kuis.kyoto-u.ac.jp/News.Archives/fj.sources/1995/
DISTFILES= 271.gz
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
USE_IMAKE= yes
NO_INSTALL_MANPAGES= yes
diff --git a/games/xflame/Makefile b/games/xflame/Makefile
index adb866a..164db98 100644
--- a/games/xflame/Makefile
+++ b/games/xflame/Makefile
@@ -10,7 +10,7 @@ DISTNAME= xflame-1.1.1
CATEGORIES= games
MASTER_SITES= http://www.owlnet.rice.edu/~rahul/
-MAINTAINER= kris@FreeBSD.ORG
+MAINTAINER= kris@FreeBSD.org
USE_IMAKE= yes
diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile
index a24808f..e1a9484 100644
--- a/games/xgalaga/Makefile
+++ b/games/xgalaga/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/games/xhime/Makefile b/games/xhime/Makefile
index 744f242..d87f315 100644
--- a/games/xhime/Makefile
+++ b/games/xhime/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= games
MASTER_SITES= http://www.tcp-ip.or.jp/~shochan/linux/
EXTRACT_SUFX= .tgz
-MAINTAINER= flathill@FreeBSD.ORG
+MAINTAINER= flathill@FreeBSD.org
WRKSRC= ${WRKDIR}/xhime1.51
USE_IMAKE= yes
diff --git a/games/xjig/Makefile b/games/xjig/Makefile
index 84f25eb..e5ed080 100644
--- a/games/xjig/Makefile
+++ b/games/xjig/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games
EXTRACT_SUFX= .tgz
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
USE_XLIB= yes
MAKEFILE= Makefile.Linux
diff --git a/games/xlife/Makefile b/games/xlife/Makefile
index af027f2..b02b93f 100644
--- a/games/xlife/Makefile
+++ b/games/xlife/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.cdrom.com/pub/X11/R5contrib/ \
ftp://ftp.kddlabs.co.jp/pub/X11/R5contrib/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
USE_IMAKE= yes
MAN1= xlife.1
diff --git a/games/xminehunter/Makefile b/games/xminehunter/Makefile
index a98db65..6657aa3 100644
--- a/games/xminehunter/Makefile
+++ b/games/xminehunter/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: xminehunter
# Version required: 0.4
# Date created: 09 January 1997
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/games/xneko/Makefile b/games/xneko/Makefile
index 638ace8..0f15319 100644
--- a/games/xneko/Makefile
+++ b/games/xneko/Makefile
@@ -11,7 +11,7 @@ PKGNAME= xneko-4.4
CATEGORIES= games
MASTER_SITES= ftp://ftp.cdrom.com/pub/bsd-sources/4.4BSD-Lite/usr/src/games/
-MAINTAINER= markm@FreeBSD.ORG
+MAINTAINER= markm@FreeBSD.org
MAN6= xneko.6
MANCOMPRESSED= maybe
diff --git a/games/xosmulti/Makefile b/games/xosmulti/Makefile
index 58b8878..f743d53 100644
--- a/games/xosmulti/Makefile
+++ b/games/xosmulti/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= games
MASTER_SITES= http://www01.u-page.so-net.ne.jp/ka2/nakanita/multi/
EXTRACT_SUFX= .gz
-MAINTAINER= flathill@FreeBSD.ORG
+MAINTAINER= flathill@FreeBSD.org
WRKSRC= ${WRKDIR}/xosmulti
USE_X_PREFIX= yes
diff --git a/games/xroach/Makefile b/games/xroach/Makefile
index 9ec6232..6be2613 100644
--- a/games/xroach/Makefile
+++ b/games/xroach/Makefile
@@ -11,7 +11,7 @@ PKGNAME= xroach-4.4
CATEGORIES= games
MASTER_SITES= ftp://ftp.cdrom.com/pub/bsd-sources/4.4BSD-Lite/usr/src/games/
-MAINTAINER= markm@FreeBSD.ORG
+MAINTAINER= markm@FreeBSD.org
MAN6= xroach.6
MANCOMPRESSED= maybe
diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile
index d68bfda..b4b19b0 100644
--- a/games/xscrabble/Makefile
+++ b/games/xscrabble/Makefile
@@ -11,7 +11,7 @@ PKGNAME= xscrabble-1.0
CATEGORIES= games
MASTER_SITES= http://www.freebsd.org/~mph/distfiles/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/games/xsok/Makefile b/games/xsok/Makefile
index 5777d636..aa41534 100644
--- a/games/xsok/Makefile
+++ b/games/xsok/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: xsok
# Version required: 1.02
# Date created: 07 Feb 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin.X11/ \
ftp://ftp.cdrom.com/pub/linux/tsx-11/sources/usr.bin.X11/
EXTRACT_SUFX= -src.tar.gz
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/games/xspringies/Makefile b/games/xspringies/Makefile
index 9b26263..68e609af 100644
--- a/games/xspringies/Makefile
+++ b/games/xspringies/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= games
MASTER_SITES= http://aixpdslib.seas.ucla.edu/pub/xspringies/RISC/3.2/src/
DISTFILES= xspringies.1.1.tar.Z
-MAINTAINER= jkh@FreeBSD.ORG
+MAINTAINER= jkh@FreeBSD.org
USE_IMAKE= yes
MAN1= xspringies.1
diff --git a/games/xtic/Makefile b/games/xtic/Makefile
index 77f47cd..e6aeb7e 100644
--- a/games/xtic/Makefile
+++ b/games/xtic/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/graphics/Mesa3/Makefile b/graphics/Mesa3/Makefile
index 0b9f94a..d5c33bb 100644
--- a/graphics/Mesa3/Makefile
+++ b/graphics/Mesa3/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://iris.ssec.wisc.edu/pub/Mesa/ \
ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MesaDemos-3.0.tar.gz
-MAINTAINER= jseger@FreeBSD.ORG
+MAINTAINER= jseger@FreeBSD.org
WRKSRC= ${WRKDIR}/Mesa-3.0
diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile
index d8930bc..ce34c8c 100644
--- a/graphics/cqcam/Makefile
+++ b/graphics/cqcam/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= graphics tk80
MASTER_SITES= http://www.cs.virginia.edu/~patrick/cqcam/
EXTRACT_SUFX= .tgz
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80 \
jpeg.9:${PORTSDIR}/graphics/jpeg
diff --git a/graphics/fbm/Makefile b/graphics/fbm/Makefile
index 0314dd6..94ee1c3 100644
--- a/graphics/fbm/Makefile
+++ b/graphics/fbm/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/graphics/convert
EXTRACT_SUFX= .tgz
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
NO_WRKSUBDIR= yes
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index 5c57748..77780f8 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://www.rasterman.com/pub/enlightenment/enlightenment/ \
ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
ftp://ftp.labs.redhat.com/pub/imlib/TAR/
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= Imlib.4:${PORTSDIR}/graphics/imlib
diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index 2d1785b..6fa745e 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: giflib
# Version required: 3.0
# Date created: 03 May 1997
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= giflib-3.0
CATEGORIES= graphics
MASTER_SITES= http://earthspace.net/~esr/giflib/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
USE_XLIB= yes
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index 2fdbfcb..099337f 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: gqview
# Version required: 0.6.1
# Date Created: 27 Oct 1998
-# Whom: Vanilla Pooh Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla Pooh Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 59a3e1f..d23e4a9 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: graphviz
# Version required: 1.4
# Date created: 03 Feb 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= graphviz-1.4
CATEGORIES= graphics tk80
MASTER_SITES= # http://www.research.att.com/sw/tools/graphviz/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
diff --git a/graphics/gtkfig/Makefile b/graphics/gtkfig/Makefile
index 8ddcc97..09c56b2 100644
--- a/graphics/gtkfig/Makefile
+++ b/graphics/gtkfig/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= graphics
MASTER_SITES= ftp://k332.feld.cvut.cz/pub/local/lemming/gtkfig/ \
http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
-MAINTAINER= dirk@FreeBSD.ORG
+MAINTAINER= dirk@FreeBSD.org
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
diff --git a/graphics/gtksee/Makefile b/graphics/gtksee/Makefile
index ab93bf3..eca4f2a 100644
--- a/graphics/gtksee/Makefile
+++ b/graphics/gtksee/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= graphics
MASTER_SITES= http://sunsite.cqi.com.cn/~hotaru/gtksee/ \
http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
-MAINTAINER= dirk@FreeBSD.ORG
+MAINTAINER= dirk@FreeBSD.org
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index d7def9a..5554117 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/imlib
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/graphics/imlib2-tmp/Makefile b/graphics/imlib2-tmp/Makefile
index d7def9a..5554117 100644
--- a/graphics/imlib2-tmp/Makefile
+++ b/graphics/imlib2-tmp/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/imlib
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index d7def9a..5554117 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/imlib
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/graphics/libungif/Makefile b/graphics/libungif/Makefile
index 2d1785b..6fa745e 100644
--- a/graphics/libungif/Makefile
+++ b/graphics/libungif/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: giflib
# Version required: 3.0
# Date created: 03 May 1997
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= giflib-3.0
CATEGORIES= graphics
MASTER_SITES= http://earthspace.net/~esr/giflib/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
USE_XLIB= yes
diff --git a/graphics/mesagl/Makefile b/graphics/mesagl/Makefile
index 0b9f94a..d5c33bb 100644
--- a/graphics/mesagl/Makefile
+++ b/graphics/mesagl/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://iris.ssec.wisc.edu/pub/Mesa/ \
ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MesaDemos-3.0.tar.gz
-MAINTAINER= jseger@FreeBSD.ORG
+MAINTAINER= jseger@FreeBSD.org
WRKSRC= ${WRKDIR}/Mesa-3.0
diff --git a/graphics/mpeg-lib/Makefile b/graphics/mpeg-lib/Makefile
index eebead1..eccb218 100644
--- a/graphics/mpeg-lib/Makefile
+++ b/graphics/mpeg-lib/Makefile
@@ -10,7 +10,7 @@ DISTNAME= mpeg_lib-1.2.1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.mni.mcgill.ca/pub/mpeg/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
WRKSRC= ${WRKDIR}/mpeg_lib
diff --git a/graphics/mpeg_play/Makefile b/graphics/mpeg_play/Makefile
index cb81365..63f37bd 100644
--- a/graphics/mpeg_play/Makefile
+++ b/graphics/mpeg_play/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= graphics
MASTER_SITES= ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/play/
EXTRACT_SUFX= -patched-src.tar.gz
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
WRKSRC= ${WRKDIR}/mpeg_play
USE_IMAKE= yes
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index d6f82c9..8924b6d 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= graphics
MASTER_SITES= ftp://ftp.x.org/R5contrib/
DISTFILES= netpbm-1mar1994.tar.gz
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff34
LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg
diff --git a/graphics/netshow/Makefile b/graphics/netshow/Makefile
index 8a34f46..5244ac0 100644
--- a/graphics/netshow/Makefile
+++ b/graphics/netshow/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: netshow
# Version required: 2.00.251
# Date created: Thu Jun 11 22:38:52 PDT 1998
-# Whom: dburr@FreeBSD.ORG
+# Whom: dburr@FreeBSD.org
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= graphics net
MASTER_SITES= http://microsoft.com/netshow/download/en/beta/
EXTRACT_SUFX= .gz
-MAINTAINER= dburr@FreeBSD.ORG
+MAINTAINER= dburr@FreeBSD.org
RUN_DEPENDS= /compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
diff --git a/graphics/p5-Chart/Makefile b/graphics/p5-Chart/Makefile
index f7e4d39..1c66325 100644
--- a/graphics/p5-Chart/Makefile
+++ b/graphics/p5-Chart/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: p5-chart
# Version required: 0.99b
# Date Created: 8 April 1998
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/graphics/p5-GD/Makefile b/graphics/p5-GD/Makefile
index 827c071..eac4b2c 100644
--- a/graphics/p5-GD/Makefile
+++ b/graphics/p5-GD/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: p5-GD
# Version required: 1.18
# Date created: June 26th 1997
-# Whom: James FitzGibbon <jfitz@FreeBSD.ORG>
+# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= GD
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/graphics/p5-GD1/Makefile b/graphics/p5-GD1/Makefile
index 827c071..eac4b2c 100644
--- a/graphics/p5-GD1/Makefile
+++ b/graphics/p5-GD1/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: p5-GD
# Version required: 1.18
# Date created: June 26th 1997
-# Whom: James FitzGibbon <jfitz@FreeBSD.ORG>
+# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= GD
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/graphics/p5-GD2/Makefile b/graphics/p5-GD2/Makefile
index 827c071..eac4b2c 100644
--- a/graphics/p5-GD2/Makefile
+++ b/graphics/p5-GD2/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: p5-GD
# Version required: 1.18
# Date created: June 26th 1997
-# Whom: James FitzGibbon <jfitz@FreeBSD.ORG>
+# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= graphics perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= GD
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/graphics/p5-Image-Size/Makefile b/graphics/p5-Image-Size/Makefile
index 6280e67..de4ad18 100644
--- a/graphics/p5-Image-Size/Makefile
+++ b/graphics/p5-Image-Size/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= graphics www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Image
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
CONFIGURE_ARGS= PREFIX=${PREFIX}
diff --git a/graphics/p5-chart/Makefile b/graphics/p5-chart/Makefile
index f7e4d39..1c66325 100644
--- a/graphics/p5-chart/Makefile
+++ b/graphics/p5-chart/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: p5-chart
# Version required: 0.99b
# Date Created: 8 April 1998
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index d3452bc..05b6116 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= plotutils
-MAINTAINER= chuckr@FreeBSD.ORG
+MAINTAINER= chuckr@FreeBSD.org
USE_XLIB= yes
GNU_CONFIGURE= yes
diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile
index 639a567..30daacf 100644
--- a/graphics/povray/Makefile
+++ b/graphics/povray/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.povray.org/pub/povray/Old-Versions/Official-3.0/Unix/ \
ftp://ftp.kappa.ro/pub/Linux/Graphics/Editors/povray/
DISTFILES= povuni_s.tgz povuni_d.tgz
-MAINTAINER= kris@FreeBSD.ORG
+MAINTAINER= kris@FreeBSD.org
LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
diff --git a/graphics/povray36/Makefile b/graphics/povray36/Makefile
index 639a567..30daacf 100644
--- a/graphics/povray36/Makefile
+++ b/graphics/povray36/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.povray.org/pub/povray/Old-Versions/Official-3.0/Unix/ \
ftp://ftp.kappa.ro/pub/Linux/Graphics/Editors/povray/
DISTFILES= povuni_s.tgz povuni_d.tgz
-MAINTAINER= kris@FreeBSD.ORG
+MAINTAINER= kris@FreeBSD.org
LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile
index 639a567..30daacf 100644
--- a/graphics/povray37/Makefile
+++ b/graphics/povray37/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.povray.org/pub/povray/Old-Versions/Official-3.0/Unix/ \
ftp://ftp.kappa.ro/pub/Linux/Graphics/Editors/povray/
DISTFILES= povuni_s.tgz povuni_d.tgz
-MAINTAINER= kris@FreeBSD.ORG
+MAINTAINER= kris@FreeBSD.org
LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 4055d33..35574b3 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: pstodit
# Version required: 3.11
# Date created: 03 July 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= pstoedit-3.11
CATEGORIES= graphics print
MASTER_SITES= http://www.geocities.com/SiliconValley/Network/1958/pstoedit/
-MAINTAINER= jseger@FreeBSD.ORG
+MAINTAINER= jseger@FreeBSD.org
RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript5
diff --git a/graphics/qcread/Makefile b/graphics/qcread/Makefile
index 40f7b4d..94f86ea 100644
--- a/graphics/qcread/Makefile
+++ b/graphics/qcread/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= graphics
MASTER_SITES= ftp://phobos.illtel.denver.co.us/pub/qcread/ \
http://phobos.illtel.denver.co.us/pub/qcread/
-MAINTAINER= billf@FreeBSD.ORG
+MAINTAINER= billf@FreeBSD.org
ONLY_FOR_ARCHS= i386
diff --git a/graphics/rayshade/Makefile b/graphics/rayshade/Makefile
index 0c04cac..6665af5 100644
--- a/graphics/rayshade/Makefile
+++ b/graphics/rayshade/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://graphics.stanford.edu/pub/rayshade/ \
ftp://ftp.princeton.edu/pub/Graphics/rayshade.4.0/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
BUILD_DEPENDS= $(LOCALBASE)/lib/librle.a:${PORTSDIR}/graphics/urt
diff --git a/graphics/sced/Makefile b/graphics/sced/Makefile
index a0ac9db..01ccf93 100644
--- a/graphics/sced/Makefile
+++ b/graphics/sced/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= graphics
MASTER_SITES= http://www.cs.berkeley.edu/~schenney/sced/src/ \
http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
RUN_DEPENDS= povray:${PORTSDIR}/graphics/povray
diff --git a/graphics/skencil/Makefile b/graphics/skencil/Makefile
index f8db284..1ed6dc9 100644
--- a/graphics/skencil/Makefile
+++ b/graphics/skencil/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: sketch
# Version required: 0.6.1
# Date created: 04 November 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= sketch-0.6.1
CATEGORIES= graphics
MASTER_SITES= http://www.online.de/home/sketch/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/include/python1.5/Imaging.h:${PORTSDIR}/graphics/py-imaging
RUN_DEPENDS= python:${PORTSDIR}/lang/python \
diff --git a/graphics/sketch/Makefile b/graphics/sketch/Makefile
index f8db284..1ed6dc9 100644
--- a/graphics/sketch/Makefile
+++ b/graphics/sketch/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: sketch
# Version required: 0.6.1
# Date created: 04 November 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= sketch-0.6.1
CATEGORIES= graphics
MASTER_SITES= http://www.online.de/home/sketch/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/include/python1.5/Imaging.h:${PORTSDIR}/graphics/py-imaging
RUN_DEPENDS= python:${PORTSDIR}/lang/python \
diff --git a/graphics/xanim/Makefile b/graphics/xanim/Makefile
index 3df1c48..cc5b539 100644
--- a/graphics/xanim/Makefile
+++ b/graphics/xanim/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://xanim.va.pubnix.com/ \
ftp://xanim.va.pubnix.com/dlls/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${EXTRA_FILES}
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
EXTRA_FILES= vid_cvid_2.1_freebsdELFx86.tgz \
vid_cyuv_1.0_freebsdELFx86.tgz \
diff --git a/graphics/xdl/Makefile b/graphics/xdl/Makefile
index 505372b..2180c34 100644
--- a/graphics/xdl/Makefile
+++ b/graphics/xdl/Makefile
@@ -10,7 +10,7 @@ DISTNAME= xdl-2.1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_LOCAL}
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
USE_X_PREFIX= yes
MAN1= xdl.1
diff --git a/graphics/xfig-devel/Makefile b/graphics/xfig-devel/Makefile
index e2cc9ef..f7d5761 100644
--- a/graphics/xfig-devel/Makefile
+++ b/graphics/xfig-devel/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications/drawing_tools/xfig
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index e2cc9ef..f7d5761 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications/drawing_tools/xfig
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/graphics/xfpovray/Makefile b/graphics/xfpovray/Makefile
index 6eecf2f..b696273 100644
--- a/graphics/xfpovray/Makefile
+++ b/graphics/xfpovray/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: xfpovray
# Version required: 1.3.1
# Date created: 20 Sep 1997
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.batse.msfc.nasa.gov/~mallozzi/home/software/xforms/src/
MASTER_SITE_SUBDIR= apps/graphics/rays/pov
EXTRACT_SUFX= .tgz
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= xforms.0:${PORTSDIR}/x11-toolkits/xforms
RUN_DEPENDS= povray:${PORTSDIR}/graphics/povray
diff --git a/graphics/xfractint/Makefile b/graphics/xfractint/Makefile
index 3fe9a01..cd64766 100644
--- a/graphics/xfractint/Makefile
+++ b/graphics/xfractint/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= graphics
MASTER_SITES= ftp://ftp.phoenix.net/pub/USERS/twegner/
EXTRACT_SUFX= .tgz
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
USE_XLIB= yes
NO_WRKSUBDIR= yes
diff --git a/graphics/xgrasp/Makefile b/graphics/xgrasp/Makefile
index 740042d..149958f 100644
--- a/graphics/xgrasp/Makefile
+++ b/graphics/xgrasp/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://qiclab.scn.rain.com/pub/X11/ \
ftp://ftp.cs.ubc.ca/mirror1/x-contrib.R5/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
USE_IMAKE= yes
MAN1= glib.1 xgrasp.1
diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile
index 2d0d793..5a4834e 100644
--- a/graphics/xli/Makefile
+++ b/graphics/xli/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
MASTER_SITE_SUBDIR= applications
DISTFILES= xli.1.16.tar.gz xli-png.tar.gz
-MAINTAINER= jkoshy@FreeBSD.ORG
+MAINTAINER= jkoshy@FreeBSD.org
LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
diff --git a/graphics/xmagv/Makefile b/graphics/xmagv/Makefile
index ab7d50e..885f9ec4 100644
--- a/graphics/xmagv/Makefile
+++ b/graphics/xmagv/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= graphics
MASTER_SITES= ftp://ftp.vector.co.jp/pack/unix/art/graphics/loader/mag/
EXTRACT_SUFX= .tgz
-MAINTAINER= flathill@FreeBSD.ORG
+MAINTAINER= flathill@FreeBSD.org
WRKSRC= ${WRKDIR}/xmagv
GNU_CONFIGURE= yes
diff --git a/graphics/xpx/Makefile b/graphics/xpx/Makefile
index a132f4d..ac1b819 100644
--- a/graphics/xpx/Makefile
+++ b/graphics/xpx/Makefile
@@ -11,7 +11,7 @@ PKGNAME= xpx-1.41
CATEGORIES= graphics
MASTER_SITES= http://www.oersted.co.jp/~yav/soft/xpx/
-MAINTAINER= flathill@FreeBSD.ORG
+MAINTAINER= flathill@FreeBSD.org
WRKSRC= ${WRKDIR}/xpx
USE_IMAKE= yes
diff --git a/graphics/xv-m17n/Makefile b/graphics/xv-m17n/Makefile
index 45f03bc..412bd55 100644
--- a/graphics/xv-m17n/Makefile
+++ b/graphics/xv-m17n/Makefile
@@ -9,7 +9,7 @@
PKGNAME= xv-m17n-3.10a
CATEGORIES= graphics
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
MASTERDIR= ${.CURDIR}/../../graphics/xv
PKGDIR= ${.CURDIR}/pkg
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index d3fc0b3..6976291 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -23,7 +23,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \
PATCH_SITES= ftp://ftp.cis.upenn.edu/pub/xv/
PATCHFILES= xv-3.10a.JPEG-patch xv-3.10a.TIFF-patch
-MAINTAINER?= shige@FreeBSD.ORG
+MAINTAINER?= shige@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff34 \
diff --git a/irc/irc/Makefile b/irc/irc/Makefile
index 223cc41..62dbeb8 100644
--- a/irc/irc/Makefile
+++ b/irc/irc/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.funet.fi/pub/networking/services/irc/server/ \
ftp://ftp.ut.ee/pub/unix/irc/server/ \
ftp://ftp.ntua.gr/pub/net/irc/server/
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
# the NOTE command is disabled by default
# ENABLE_NOTE=yes
diff --git a/irc/ircII/Makefile b/irc/ircII/Makefile
index 9b78510..3335f92 100644
--- a/irc/ircII/Makefile
+++ b/irc/ircII/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ircii-4.4
CATEGORIES= irc
MASTER_SITES= ftp://cs-ftp.bu.edu/irc/clients/
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
GNU_CONFIGURE= yes
CONFIGURE_ENV= IRCLIB=${PREFIX}/share/irc
diff --git a/japanese/Canna/Makefile b/japanese/Canna/Makefile
index c80724d..80c57d0 100644
--- a/japanese/Canna/Makefile
+++ b/japanese/Canna/Makefile
@@ -12,7 +12,7 @@ PKGNAME= ja-Canna-3.2.2
CATEGORIES= japanese
MASTER_SITES= ftp://ftp.nec.co.jp/pub/Canna/Canna32/
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
BUILD_DEPENDS= imake:${PORTSDIR}/x11/XFree86
diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile
index c80724d..80c57d0 100644
--- a/japanese/canna-lib/Makefile
+++ b/japanese/canna-lib/Makefile
@@ -12,7 +12,7 @@ PKGNAME= ja-Canna-3.2.2
CATEGORIES= japanese
MASTER_SITES= ftp://ftp.nec.co.jp/pub/Canna/Canna32/
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
BUILD_DEPENDS= imake:${PORTSDIR}/x11/XFree86
diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile
index c80724d..80c57d0 100644
--- a/japanese/canna-server/Makefile
+++ b/japanese/canna-server/Makefile
@@ -12,7 +12,7 @@ PKGNAME= ja-Canna-3.2.2
CATEGORIES= japanese
MASTER_SITES= ftp://ftp.nec.co.jp/pub/Canna/Canna32/
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
BUILD_DEPENDS= imake:${PORTSDIR}/x11/XFree86
diff --git a/japanese/cdrom2/Makefile b/japanese/cdrom2/Makefile
index 1d5b149..4dfdf78 100644
--- a/japanese/cdrom2/Makefile
+++ b/japanese/cdrom2/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: cdrom2
# Version required: 1996/06/16
# Date created: 03 Feb 1997
-# Whom: Masafumi NAKANE <max@FreeBSD.ORG>
+# Whom: Masafumi NAKANE <max@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= ja-cdrom2-1996.06.16
CATEGORIES= japanese misc
MASTER_SITES= ftp://ftp.nerimadors.or.jp/pub/src/cdrom2/
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
WRKSRC= ${WRKDIR}/cdrom2
DIST_SUBDIR= cdrom2
diff --git a/japanese/chasen/Makefile b/japanese/chasen/Makefile
index 313e98d..0f91444 100644
--- a/japanese/chasen/Makefile
+++ b/japanese/chasen/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= japanese
MASTER_SITES= ftp://ftp.aist-nara.ac.jp/lab/nlp/tools/chasen/ \
http://www.freebsd.org/~kuriyama/distfiles/
-MAINTAINER= kuriyama@FreeBSD.ORG
+MAINTAINER= kuriyama@FreeBSD.org
WRKSRC= ${WRKDIR}/chasen1.51
diff --git a/japanese/chimera/Makefile b/japanese/chimera/Makefile
index f3ada1e..148f6fc 100644
--- a/japanese/chimera/Makefile
+++ b/japanese/chimera/Makefile
@@ -16,7 +16,7 @@ PATCH_SITES= http://hasse.mathematik.tu-muenchen.de/%7Enikl/chimera-1.65p/ \
PATCHFILES= chimera-1.70p0-1.70p1.gz diff-1.70p1-jp-01
PATCH_DIST_STRIP= -p1
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
FETCH_BEFORE_ARGS= -b
USE_IMAKE= yes
diff --git a/japanese/dvi2tty/Makefile b/japanese/dvi2tty/Makefile
index 315d53a..9ff9ef8 100644
--- a/japanese/dvi2tty/Makefile
+++ b/japanese/dvi2tty/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: dvi2tty
# Version required: 5.0
# Date created: 30 Mar. 1996
-# Whom: Masafumi NAKANE <max@FreeBSD.ORG>
+# Whom: Masafumi NAKANE <max@FreeBSD.org>
#
# $FreeBSD$
#
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.web.ad.jp/pub/TeX/akiu/dviwares/dvi2tty/
PATCH_SITES= ftp://ftp.web.ad.jp/pub/TeX/akiu/dviwares/dvi2tty/
PATCHFILES= dvi2tty-ascii-jtex-patch dvi2tty.c-patch
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
RUN_DEPENDS= jless:${PORTSDIR}/japanese/less
diff --git a/japanese/emacs20-dl-canna/Makefile b/japanese/emacs20-dl-canna/Makefile
index 37d3443..e34cbcd 100644
--- a/japanese/emacs20-dl-canna/Makefile
+++ b/japanese/emacs20-dl-canna/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= japanese editors
MASTER_SITES= ftp://ftp.jaist.ac.jp/pub/GNU/elisp/emacs-20-dl/ \
ftp://ftp.ring.gr.jp/pub/text/elisp/jaist/emacs-20-dl/
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
LIB_DEPENDS= canna.1:${PORTSDIR}/japanese/Canna
BUILD_DEPENDS= emacs-dl-${EMACS_VER}:${EMACSDL_DIR} \
diff --git a/japanese/emacs20-dl-wnn6/Makefile b/japanese/emacs20-dl-wnn6/Makefile
index 9d49a16..76562b3 100644
--- a/japanese/emacs20-dl-wnn6/Makefile
+++ b/japanese/emacs20-dl-wnn6/Makefile
@@ -11,7 +11,7 @@ PKGNAME= ja-emacs20-dl-wnn6-0.3.6
CATEGORIES= japanese editors
MASTER_SITES= http://tt-www.cs.titech.ac.jp/~katsuya/emacs/
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
LIB_DEPENDS= wnn6.1:${.CURDIR}/../../japanese/Wnn6-lib
BUILD_DEPENDS= emacs-dl-${EMACS_VER}:${EMACSDL_DIR} \
diff --git a/japanese/exmh2/Makefile b/japanese/exmh2/Makefile
index cc2d343..e0a310a 100644
--- a/japanese/exmh2/Makefile
+++ b/japanese/exmh2/Makefile
@@ -9,7 +9,7 @@
PKGNAME= ja-${DISTNAME}
CATEGORIES= japanese mail tk80
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
JAPANESE_EXMH= yes
diff --git a/japanese/gawk/Makefile b/japanese/gawk/Makefile
index 7136950..a818500 100644
--- a/japanese/gawk/Makefile
+++ b/japanese/gawk/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= japanese textproc
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= gawk
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
HAS_CONFIGURE= yes
CONFIGURE_ARGS= bsd44
diff --git a/japanese/gicq/Makefile b/japanese/gicq/Makefile
index 0de6953..e780c3b 100644
--- a/japanese/gicq/Makefile
+++ b/japanese/gicq/Makefile
@@ -16,7 +16,7 @@ PATCH_SITES= http://www.freebsd.org/~flathill/distfiles/ \
PATCHFILES= gicq-0.33ja.patch
PATCH_DIST_STRIP= -p1
-MAINTAINER= flathill@FreeBSD.ORG
+MAINTAINER= flathill@FreeBSD.org
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
icq.0:${PORTSDIR}/japanese/libicq
diff --git a/japanese/grep/Makefile b/japanese/grep/Makefile
index 8241716..3689255 100644
--- a/japanese/grep/Makefile
+++ b/japanese/grep/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= japanese textproc
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= grep
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
GNU_CONFIGURE= yes
PATCH_STRIP= -p1
diff --git a/japanese/gxditview/Makefile b/japanese/gxditview/Makefile
index 9050f9f..fe18346 100644
--- a/japanese/gxditview/Makefile
+++ b/japanese/gxditview/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= japanese print
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= groff
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
PATCH_SITES= ftp://ftp.iij.ad.jp/pub/NetNews/fj.sources/volume95/Apr/
PATCHFILES= jgroff-0.98.diff.gz
diff --git a/japanese/ircII/Makefile b/japanese/ircII/Makefile
index cea784d..ec53f82 100644
--- a/japanese/ircII/Makefile
+++ b/japanese/ircII/Makefile
@@ -17,7 +17,7 @@ PATCH_SITES= ftp://ftp.kyoto.wide.ad.jp/IRC/ircII/
PATCHFILES= ircii-2.8.2-jp.patch.gz
PATCH_DIST_STRIP= -p1
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
GNU_CONFIGURE= yes
MAN1= irc.1
diff --git a/japanese/jls/Makefile b/japanese/jls/Makefile
index 0dcf9e3..61462d6 100644
--- a/japanese/jls/Makefile
+++ b/japanese/jls/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= japanese
MASTER_SITES= http://www.freebsd.org/~shige/ports/ \
http://www.yuasa.kuis.kyoto-u.ac.jp/~shige/FreeBSD/programs/
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
MAN1= jls.1
MANCOMPRESSED= yes
diff --git a/japanese/kakasi/Makefile b/japanese/kakasi/Makefile
index 50ab7f1..c78a04a 100644
--- a/japanese/kakasi/Makefile
+++ b/japanese/kakasi/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: kakasi
# Version required: 2.2.5
# Date created: 26 Mar. 1996
-# Whom: Masafumi NAKANE <max@FreeBSD.ORG>
+# Whom: Masafumi NAKANE <max@FreeBSD.org>
#
# $FreeBSD$
#
@@ -19,7 +19,7 @@ MASTER_SITES= ftp://sunsite.sut.ac.jp/pub/asia-info/japanese-src/packages/ \
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} kakasidict.940620.gz \
kakasi-ext.tar.gz
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} kakasi-ext.tar.gz
WRKSRC= ${WRKDIR}/${DISTNAME}/src
diff --git a/japanese/kon2-16dot/Makefile b/japanese/kon2-16dot/Makefile
index 0c64f4b..5e46f5b 100644
--- a/japanese/kon2-16dot/Makefile
+++ b/japanese/kon2-16dot/Makefile
@@ -17,7 +17,7 @@ DISTFILES= kon2-0.3.tar.gz \
k14.bdf 7x14rk.bdf \
jiskan16.bdf 8x16rk.bdf
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
ONLY_FOR_ARCHS= i386
diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile
index 754c44a..d2ef376 100644
--- a/japanese/kterm/Makefile
+++ b/japanese/kterm/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
http://www.freebsd.org/~shige/ports/kterm/
MASTER_SITE_SUBDIR= applications
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/japanese/libicq/Makefile b/japanese/libicq/Makefile
index 011971a..bfdc6b5 100644
--- a/japanese/libicq/Makefile
+++ b/japanese/libicq/Makefile
@@ -16,7 +16,7 @@ PATCH_SITES= http://www.freebsd.org/~flathill/distfiles/ \
PATCHFILES= libicq-0.33ja.patch
PATCH_DIST_STRIP= -p1
-MAINTAINER= flathill@FreeBSD.ORG
+MAINTAINER= flathill@FreeBSD.org
LIB_DEPENDS= glib12.2:${PORTSDIR}/devel/glib12
diff --git a/japanese/lynx-current/Makefile b/japanese/lynx-current/Makefile
index dfe62d8..2c0af47 100644
--- a/japanese/lynx-current/Makefile
+++ b/japanese/lynx-current/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: ja-lynx-current
# Version required: 2.8.2pre.5
# Date created: 10 August 1998
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= ja-lynx-2.8.2.pre5
CATEGORIES= japanese www
MASTER_SITES= http://sol.slcc.edu/lynx/current/
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
NO_LATEST_LINK= YES
WRKSRC= ${WRKDIR}/lynx2-8-2
diff --git a/japanese/lynx/Makefile b/japanese/lynx/Makefile
index c3316cf..3cf94db 100644
--- a/japanese/lynx/Makefile
+++ b/japanese/lynx/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: ja-lynx
# Version required: 2.8.2 release 1
# Date created: 10 August 1998
-# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
+# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= ja-lynx-2.8.2.rel1
CATEGORIES= japanese www
MASTER_SITES= http://sol.slcc.edu/lynx/current/
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
WRKSRC= ${WRKDIR}/lynx2-8-2
diff --git a/japanese/lyx/Makefile b/japanese/lyx/Makefile
index 136d4eb..d9ebcc6 100644
--- a/japanese/lyx/Makefile
+++ b/japanese/lyx/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
http://cgi.din.or.jp/~kawakami/product/LyX/
DISTFILES= lyx-1.0.0.tar.gz lyx-jp-kit0.04for1.0.0.tar.gz
-MAINTAINER= flathill@FreeBSD.ORG
+MAINTAINER= flathill@FreeBSD.org
BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX
RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
diff --git a/japanese/man/Makefile b/japanese/man/Makefile
index cab7331..74efc91 100644
--- a/japanese/man/Makefile
+++ b/japanese/man/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= japanese
MASTER_SITES= ftp://daemon.jp.freebsd.org/pub/FreeBSD-jp/man-jp/ \
${MASTER_SITE_PORTS_JP}
-MAINTAINER= kuriyama@FreeBSD.ORG
+MAINTAINER= kuriyama@FreeBSD.org
RUN_DEPENDS= ${PREFIX}/bin/groff:${PORTSDIR}/japanese/groff \
jless:${PORTSDIR}/japanese/less
diff --git a/japanese/mhonarc/Makefile b/japanese/mhonarc/Makefile
index dd77ff6..f1edb85 100644
--- a/japanese/mhonarc/Makefile
+++ b/japanese/mhonarc/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES= http://www.oac.uci.edu/indiv/ehood/tar/ \
http://www.freebsd.org/~flathill/distfiles/
DISTFILES= MHonArc2.3.3.tar.gz iso2022.pl
-MAINTAINER= flathill@FreeBSD.ORG
+MAINTAINER= flathill@FreeBSD.org
EXTRACT_ONLY= MHonArc2.3.3.tar.gz
Y2K= http://www.oac.uci.edu/indiv/ehood/MHonArc/doc/faq/general.html#y2k
diff --git a/japanese/micq/Makefile b/japanese/micq/Makefile
index e2e6459..8990661 100644
--- a/japanese/micq/Makefile
+++ b/japanese/micq/Makefile
@@ -18,7 +18,7 @@ PATCH_SITES= http://www.tahoo.org/~taku/soft/micq-0.4.0-jp.patch \
PATCHFILES= micq-0.4.0-jp.patch
PATCH_DIST_STRIP= -p1
-MAINTAINER= flathill@FreeBSD.ORG
+MAINTAINER= flathill@FreeBSD.org
WRKSRC= ${WRKDIR}/micq-0.4.0
diff --git a/japanese/mimekit/Makefile b/japanese/mimekit/Makefile
index 7e31d81..45d0795 100644
--- a/japanese/mimekit/Makefile
+++ b/japanese/mimekit/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: mimekit
# Version required: 1.7
# Date created: 9 April 1996
-# Whom: Masafumi NAKANE <max@FreeBSD.ORG>
+# Whom: Masafumi NAKANE <max@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= japanese devel mail
MASTER_SITES= ftp://etlport.etl.go.jp/pub/ccipr/DeleGate/ \
ftp://ftp.iij.ad.jp/pub/mail/mime/
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
post-install:
.if !defined(NOPORTDOCS)
diff --git a/japanese/mnews-gnspool/Makefile b/japanese/mnews-gnspool/Makefile
index 961f66b..c83ad9a 100644
--- a/japanese/mnews-gnspool/Makefile
+++ b/japanese/mnews-gnspool/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: mnews-gnspool
# Version required: 1.21
# Date created: 23 Sep 1996
-# Whom: Masafumi NAKANE <max@FreeBSD.ORG>
+# Whom: Masafumi NAKANE <max@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/japanese/mnews/Makefile b/japanese/mnews/Makefile
index d91160d..414ef53 100644
--- a/japanese/mnews/Makefile
+++ b/japanese/mnews/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: mnews
# Version required: 1.21
# Date created: 23 Sep 1996
-# Whom: Masafumi NAKANE <max@FreeBSD.ORG>
+# Whom: Masafumi NAKANE <max@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/japanese/namazu/Makefile b/japanese/namazu/Makefile
index 9cf475a..d2db2de 100644
--- a/japanese/namazu/Makefile
+++ b/japanese/namazu/Makefile
@@ -11,7 +11,7 @@ PKGNAME= ja-namazu-1.3.0.8
CATEGORIES= japanese textproc
MASTER_SITES= http://openlab.ring.gr.jp/namazu/release/
-MAINTAINER= flathill@FreeBSD.ORG
+MAINTAINER= flathill@FreeBSD.org
BUILD_DEPENDS= kakasi:${PORTSDIR}/japanese/kakasi \
nkf:${PORTSDIR}/japanese/nkf
diff --git a/japanese/namazu2/Makefile b/japanese/namazu2/Makefile
index 9cf475a..d2db2de 100644
--- a/japanese/namazu2/Makefile
+++ b/japanese/namazu2/Makefile
@@ -11,7 +11,7 @@ PKGNAME= ja-namazu-1.3.0.8
CATEGORIES= japanese textproc
MASTER_SITES= http://openlab.ring.gr.jp/namazu/release/
-MAINTAINER= flathill@FreeBSD.ORG
+MAINTAINER= flathill@FreeBSD.org
BUILD_DEPENDS= kakasi:${PORTSDIR}/japanese/kakasi \
nkf:${PORTSDIR}/japanese/nkf
diff --git a/japanese/nethack/Makefile b/japanese/nethack/Makefile
index e6cb3a7..df5cf6c 100644
--- a/japanese/nethack/Makefile
+++ b/japanese/nethack/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= nethack
PATCH_SITES= ftp://mitsuko.jaist.ac.jp/pub/nethack/
PATCHFILES= jnethack-1.0.5.19970924.gz
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/japanese/nethack32/Makefile b/japanese/nethack32/Makefile
index e6cb3a7..df5cf6c 100644
--- a/japanese/nethack32/Makefile
+++ b/japanese/nethack32/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= nethack
PATCH_SITES= ftp://mitsuko.jaist.ac.jp/pub/nethack/
PATCHFILES= jnethack-1.0.5.19970924.gz
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/japanese/nethack34/Makefile b/japanese/nethack34/Makefile
index e6cb3a7..df5cf6c 100644
--- a/japanese/nethack34/Makefile
+++ b/japanese/nethack34/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= nethack
PATCH_SITES= ftp://mitsuko.jaist.ac.jp/pub/nethack/
PATCHFILES= jnethack-1.0.5.19970924.gz
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/japanese/netscape3.language/Makefile b/japanese/netscape3.language/Makefile
index bd5825d..dcef25f 100644
--- a/japanese/netscape3.language/Makefile
+++ b/japanese/netscape3.language/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: netscape3.language
# Version required: 3.04
# Date created: 17 November 1997
-# Whom: SADA Kenji <sada@FreeBSD.ORG>
+# Whom: SADA Kenji <sada@FreeBSD.org>
#
# $FreeBSD$
#
@@ -14,7 +14,7 @@ DISTFILES= NLS.tar.gz \
Netscape-JPfont \
Netscape-v301-ja_euc.ad.gz
-MAINTAINER= sada@FreeBSD.ORG
+MAINTAINER= sada@FreeBSD.org
RUN_DEPENDS= \
${PREFIX}/bin/netscape:${PORTSDIR}/www/netscape3 \
diff --git a/japanese/netscape4-communicator/Makefile b/japanese/netscape4-communicator/Makefile
index bf467cf..ea8a645 100644
--- a/japanese/netscape4-communicator/Makefile
+++ b/japanese/netscape4-communicator/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: Netscape browser with Japanese resources
# Version required: 4.08
# Date created: 13 Mar 1998
-# Whom: sada@FreeBSD.ORG
+# Whom: sada@FreeBSD.org
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ MASTER_SITES= ${MASTER_SITE_PORTS_JP} \
http://www.bres.tsukuba.ac.jp/~yohta/netscape/
DISTFILES= ${JAPANIZE_KIT}
-MAINTAINER= sada@FreeBSD.ORG
+MAINTAINER= sada@FreeBSD.org
# ?= for ports that include this Makefile
RUN_DEPENDS?= ${PREFIX}/bin/${BROWSER}-${BROWSER_VERSION}:${PORTSDIR}/www/netscape4-${BROWSER}
diff --git a/japanese/netscape4-navigator/Makefile b/japanese/netscape4-navigator/Makefile
index c6d56a1..9ccbec3 100644
--- a/japanese/netscape4-navigator/Makefile
+++ b/japanese/netscape4-navigator/Makefile
@@ -1,14 +1,14 @@
# New ports collection makefile for: Netscape browser with Japanese resources
# Version required: 4.08
# Date created: 13 Mar 1998
-# Whom: sada@FreeBSD.ORG
+# Whom: sada@FreeBSD.org
#
# $FreeBSD$
#
MASTERDIR= ${.CURDIR}/../netscape4-communicator
-MAINTAINER= sada@FreeBSD.ORG
+MAINTAINER= sada@FreeBSD.org
BROWSER= navigator
diff --git a/japanese/netscape47-communicator/Makefile b/japanese/netscape47-communicator/Makefile
index 21c05ff..182afe0 100644
--- a/japanese/netscape47-communicator/Makefile
+++ b/japanese/netscape47-communicator/Makefile
@@ -8,7 +8,7 @@
MASTERDIR= ${.CURDIR}/../netscape4-communicator
-MAINTAINER= sada@FreeBSD.ORG
+MAINTAINER= sada@FreeBSD.org
RUN_DEPENDS= ${PREFIX}/bin/${BROWSER}-${BROWSER_VERSION}:${PORTSDIR}/www/netscape46-${BROWSER}
diff --git a/japanese/netscape47-navigator/Makefile b/japanese/netscape47-navigator/Makefile
index 5251a13..b8e4f2b 100644
--- a/japanese/netscape47-navigator/Makefile
+++ b/japanese/netscape47-navigator/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: Netscape browser with Japanese resources
# Version required: 4.6
# Date created: 29 Dec 1998
-# Whom: sada@FreeBSD.ORG
+# Whom: sada@FreeBSD.org
#
# $FreeBSD$
#
-MAINTAINER= sada@FreeBSD.ORG
+MAINTAINER= sada@FreeBSD.org
FILESDIR= ${BASEDIR}/files
diff --git a/japanese/netscape48-communicator/Makefile b/japanese/netscape48-communicator/Makefile
index bf467cf..ea8a645 100644
--- a/japanese/netscape48-communicator/Makefile
+++ b/japanese/netscape48-communicator/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: Netscape browser with Japanese resources
# Version required: 4.08
# Date created: 13 Mar 1998
-# Whom: sada@FreeBSD.ORG
+# Whom: sada@FreeBSD.org
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ MASTER_SITES= ${MASTER_SITE_PORTS_JP} \
http://www.bres.tsukuba.ac.jp/~yohta/netscape/
DISTFILES= ${JAPANIZE_KIT}
-MAINTAINER= sada@FreeBSD.ORG
+MAINTAINER= sada@FreeBSD.org
# ?= for ports that include this Makefile
RUN_DEPENDS?= ${PREFIX}/bin/${BROWSER}-${BROWSER_VERSION}:${PORTSDIR}/www/netscape4-${BROWSER}
diff --git a/japanese/nkf/Makefile b/japanese/nkf/Makefile
index cfaf3f8..431e88e 100644
--- a/japanese/nkf/Makefile
+++ b/japanese/nkf/Makefile
@@ -11,7 +11,7 @@ PKGNAME= ja-nkf-1.62
CATEGORIES= japanese
MASTER_SITES= http://www.sfc.wide.ad.jp/~max/FreeBSD/ports/distfiles/
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
MAN1= nkf.1
diff --git a/japanese/okphone/Makefile b/japanese/okphone/Makefile
index fdd6725..a8f1ade 100644
--- a/japanese/okphone/Makefile
+++ b/japanese/okphone/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.fit.ac.jp/pub/Net/okphone/
PATCH_SITES= ftp://ftp.fit.ac.jp/pub/Net/okphone/patch/
PATCHFILES= okphone-1.2.FreeBSD-patch.rev2.gz
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
PATCH_DIST_STRIP= -p1
MAN1= phone.1
diff --git a/japanese/paledit/Makefile b/japanese/paledit/Makefile
index 1293ff58..e259e79 100644
--- a/japanese/paledit/Makefile
+++ b/japanese/paledit/Makefile
@@ -11,7 +11,7 @@ PKGNAME= ja-${DISTNAME}
CATEGORIES= japanese sysutils
MASTER_SITES= http://www.swlab.csce.kyushu-u.ac.jp/~nom/prj/paledit/
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
USE_PERL5= yes
GNU_CONFIGURE= yes
diff --git a/japanese/perl5/Makefile b/japanese/perl5/Makefile
index 836f6ac..15c7259 100644
--- a/japanese/perl5/Makefile
+++ b/japanese/perl5/Makefile
@@ -35,7 +35,7 @@ PATCH_SITES= ftp://ftp.funet.fi/pub/languages/perl/CPAN/authors/id/WATANABE/ \
PATCHFILES= jperl5.005_03-990822.pat.gz
PATCH_DIST_STRIP= -p1
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
.include <bsd.port.pre.mk>
diff --git a/japanese/pine/Makefile b/japanese/pine/Makefile
index 1020d6b..a7f5d3c 100644
--- a/japanese/pine/Makefile
+++ b/japanese/pine/Makefile
@@ -16,7 +16,7 @@ DISTFILES= pine3.95.tar.gz pine3.95lj1.1b2.tar.gz
PATCHFILES= pine3.95lj1.1b2-b3.diff.gz
PATCH_SITES= ${MASTER_SITE_PORTS_JP}
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
BROKEN_ELF= yes
diff --git a/japanese/platex-common/Makefile b/japanese/platex-common/Makefile
index fc601fe..bc90d00 100644
--- a/japanese/platex-common/Makefile
+++ b/japanese/platex-common/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: platex2e-common
# Version required: <1998/09/01>
# Date created: 05 Oct 1997
-# Whom: Masafumi NAKANE <max@FreeBSD.ORG>
+# Whom: Masafumi NAKANE <max@FreeBSD.org>
#
# $FreeBSD$
#
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/platex/1998-09-01/ \
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ecfonts-1.0.tar.gz tfm.tar \
amsfonts-sources.tar.Z
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
BUILD_DEPENDS= ptex-common:${PORTSDIR}/japanese/ptex-common
RUN_DEPENDS= ptex-common:${PORTSDIR}/japanese/ptex-common
diff --git a/japanese/platex-euc/Makefile b/japanese/platex-euc/Makefile
index aade414..d9c7a45 100644
--- a/japanese/platex-euc/Makefile
+++ b/japanese/platex-euc/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: platex2e-euc
# Version required: <1998/09/01>
# Date created: 05 Oct 1997
-# Whom: Masafumi NAKANE <max@FreeBSD.ORG>
+# Whom: Masafumi NAKANE <max@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/platex/1998-09-01/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
plpatch.ltx jclasses.dtx tascmac.sty
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
BUILD_DEPENDS= ptex:${PORTSDIR}/japanese/ptex-euc \
platex-common:${PORTSDIR}/japanese/platex-common \
diff --git a/japanese/platex-jis/Makefile b/japanese/platex-jis/Makefile
index c691187..868448b 100644
--- a/japanese/platex-jis/Makefile
+++ b/japanese/platex-jis/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: platex2e-jis
# Version required: <1998/09/01>
# Date created: 05 Oct 1997
-# Whom: Masafumi NAKANE <max@FreeBSD.ORG>
+# Whom: Masafumi NAKANE <max@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/platex/1998-09-01/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
plpatch.ltx jclasses.dtx tascmac.sty
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
BUILD_DEPENDS= ptex:${PORTSDIR}/japanese/ptex-jis \
platex-common:${PORTSDIR}/japanese/platex-common
diff --git a/japanese/platex-sjis/Makefile b/japanese/platex-sjis/Makefile
index 0b198ea..6e7340e 100644
--- a/japanese/platex-sjis/Makefile
+++ b/japanese/platex-sjis/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: platex2e-sjis
# Version required: <1998/09/01>
# Date created: 05 Oct 1997
-# Whom: Masafumi NAKANE <max@FreeBSD.ORG>
+# Whom: Masafumi NAKANE <max@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/platex/1998-09-01/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
plpatch.ltx jclasses.dtx tascmac.sty
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
BUILD_DEPENDS= ptex:${PORTSDIR}/japanese/ptex-sjis \
platex-common:${PORTSDIR}/japanese/platex-common \
diff --git a/japanese/ppxp/Makefile b/japanese/ppxp/Makefile
index af17e87..52abe69 100644
--- a/japanese/ppxp/Makefile
+++ b/japanese/ppxp/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: ppxp
# Version required: depend on ports/net/ppxp
# Date created: 01 Jan 1999
-# Whom: sada@FreeBSD.ORG
+# Whom: sada@FreeBSD.org
#
# $FreeBSD$
#
@@ -9,7 +9,7 @@
PKGNAME= ja-${DISTNAME}
MASTERDIR= ${.CURDIR}/../../net/ppxp
-MAINTAINER= sada@FreeBSD.ORG
+MAINTAINER= sada@FreeBSD.org
USE_TCLJP= yes
diff --git a/japanese/ptex-base/Makefile b/japanese/ptex-base/Makefile
index 678d230..b6afb38 100644
--- a/japanese/ptex-base/Makefile
+++ b/japanese/ptex-base/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= japanese print
MASTER_SITES= ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ptex218/web2c/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} web-7.2.tar.gz texmflib-7.3.tar.gz
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
MANUAL_PACKAGE_BUILD= incompatible with other versions of ptex-*
USE_GMAKE= yes
diff --git a/japanese/ptex-common/Makefile b/japanese/ptex-common/Makefile
index 678d230..b6afb38 100644
--- a/japanese/ptex-common/Makefile
+++ b/japanese/ptex-common/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= japanese print
MASTER_SITES= ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ptex218/web2c/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} web-7.2.tar.gz texmflib-7.3.tar.gz
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
MANUAL_PACKAGE_BUILD= incompatible with other versions of ptex-*
USE_GMAKE= yes
diff --git a/japanese/ptex-euc/Makefile b/japanese/ptex-euc/Makefile
index 37f048e..93c1908 100644
--- a/japanese/ptex-euc/Makefile
+++ b/japanese/ptex-euc/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ptex218/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} plib-1.4-euc.tar.gz \
Makefile.in.patch.txt
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
RUN_DEPENDS= ptex-common:${PORTSDIR}/japanese/ptex-common
diff --git a/japanese/ptex-jis/Makefile b/japanese/ptex-jis/Makefile
index da838de..cee67a0 100644
--- a/japanese/ptex-jis/Makefile
+++ b/japanese/ptex-jis/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ptex218/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} plib-1.4-jis.tar.gz \
Makefile.in.patch.txt
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
RUN_DEPENDS= ptex-common:${PORTSDIR}/japanese/ptex-common
diff --git a/japanese/ptex-sjis/Makefile b/japanese/ptex-sjis/Makefile
index e3ba883..69f3cf8 100644
--- a/japanese/ptex-sjis/Makefile
+++ b/japanese/ptex-sjis/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ptex218/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} plib-1.4-sj.tar.gz \
Makefile.in.patch.txt
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
RUN_DEPENDS= ptex-common:${PORTSDIR}/japanese/ptex-common
diff --git a/japanese/ptex/Makefile b/japanese/ptex/Makefile
index 37f048e..93c1908 100644
--- a/japanese/ptex/Makefile
+++ b/japanese/ptex/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ptex218/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} plib-1.4-euc.tar.gz \
Makefile.in.patch.txt
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
RUN_DEPENDS= ptex-common:${PORTSDIR}/japanese/ptex-common
diff --git a/japanese/qkc/Makefile b/japanese/qkc/Makefile
index 363dc1c..12ea5bc 100644
--- a/japanese/qkc/Makefile
+++ b/japanese/qkc/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: qkcc
# Version required: 1.0
# Date created: 03 May 1996
-# Whom: Masafumi NAKANE <max@FreeBSD.ORG>
+# Whom: Masafumi NAKANE <max@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= japanese
MASTER_SITES= ftp://ftp.lab.kdd.co.jp/Usenet/fj.sources/1995/oct/ \
ftp://ftp.iis.u-tokyo.ac.jp/pub1/unix/Kanji/
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
USE_ZIP= yes
NO_WRKSUBDIR= yes
diff --git a/japanese/sed/Makefile b/japanese/sed/Makefile
index 9e12845..55d7be6 100644
--- a/japanese/sed/Makefile
+++ b/japanese/sed/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= japanese textproc
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= sed
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
HAS_CONFIGURE= yes
PATCH_STRIP= -p1
diff --git a/japanese/tcsh-nls-asuka/Makefile b/japanese/tcsh-nls-asuka/Makefile
index 5620bcd..a0b5266 100644
--- a/japanese/tcsh-nls-asuka/Makefile
+++ b/japanese/tcsh-nls-asuka/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: ja-tcsh NLS catalog (Soryu Asuka Langley)
# Version required: 6.08.05
# Date created: 19 August 1998
-# Whom: Issei Suzuki <issei@jp.FreeBSD.ORG>
+# Whom: Issei Suzuki <issei@jp.FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= ja-tcsh-nls-asuka-6.08.05
CATEGORIES= japanese shells
MASTER_SITES= ${MASTER_SITE_PORTS_JP}
-MAINTAINER= issei@jp.FreeBSD.ORG
+MAINTAINER= issei@jp.FreeBSD.org
MASTERDIR= ${.CURDIR}/../tcsh-nls-generic
PKGDIR= ${.CURDIR}/pkg
diff --git a/japanese/tcsh-nls-ayanami/Makefile b/japanese/tcsh-nls-ayanami/Makefile
index cc1ac04..a40c482 100644
--- a/japanese/tcsh-nls-ayanami/Makefile
+++ b/japanese/tcsh-nls-ayanami/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: ja-tcsh NLS catalog (Ayanami Rei)
# Version required: 6.08.05
# Date created: 19 August 1998
-# Whom: Issei Suzuki <issei@jp.FreeBSD.ORG>
+# Whom: Issei Suzuki <issei@jp.FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= ja-tcsh-nls-ayanami-6.08.05
CATEGORIES= japanese shells
MASTER_SITES= ${MASTER_SITE_PORTS_JP}
-MAINTAINER= issei@jp.FreeBSD.ORG
+MAINTAINER= issei@jp.FreeBSD.org
MASTERDIR= ${.CURDIR}/../tcsh-nls-generic
PKGDIR= ${.CURDIR}/pkg
diff --git a/japanese/tcsh-nls-generic/Makefile b/japanese/tcsh-nls-generic/Makefile
index 1b04b33..4d3fd34 100644
--- a/japanese/tcsh-nls-generic/Makefile
+++ b/japanese/tcsh-nls-generic/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: ja-tcsh NLS catalog (Generic Japanese)
# Version required: 6.08.05
# Date created: 19 August 1998
-# Whom: Issei Suzuki <issei@jp.FreeBSD.ORG>
+# Whom: Issei Suzuki <issei@jp.FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ CATEGORIES= japanese shells
MASTER_SITES= ftp://ftp.astron.com/pub/tcsh/ ${MASTER_SITE_PORTS_JP}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}.add2${EXTRACT_SUFX}
-MAINTAINER= issei@jp.FreeBSD.ORG
+MAINTAINER= issei@jp.FreeBSD.org
PATCH_DIST_STRIP= -p1
NLSSRC= ${DISTNAME}/nls/ja
diff --git a/japanese/tcsh-nls-koshiki/Makefile b/japanese/tcsh-nls-koshiki/Makefile
index a8af1ac..771f108 100644
--- a/japanese/tcsh-nls-koshiki/Makefile
+++ b/japanese/tcsh-nls-koshiki/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: ja-tcsh NLS catalog (Koshiki Yukari)
# Version required: 6.08.05
# Date created: 19 August 1998
-# Whom: Issei Suzuki <issei@jp.FreeBSD.ORG>
+# Whom: Issei Suzuki <issei@jp.FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= ja-tcsh-nls-koshiki-6.08.05
CATEGORIES= japanese shells
MASTER_SITES= ${MASTER_SITE_PORTS_JP}
-MAINTAINER= issei@jp.FreeBSD.ORG
+MAINTAINER= issei@jp.FreeBSD.org
MASTERDIR= ${.CURDIR}/../tcsh-nls-generic
PKGDIR= ${.CURDIR}/pkg
diff --git a/japanese/tcsh-nls-merril/Makefile b/japanese/tcsh-nls-merril/Makefile
index 38e0593..32de6dc 100644
--- a/japanese/tcsh-nls-merril/Makefile
+++ b/japanese/tcsh-nls-merril/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: ja-tcsh NLS catalog (Merril)
# Version required: 6.08.05
# Date created: 6 January 1999
-# Whom: Issei Suzuki <issei@jp.FreeBSD.ORG>
+# Whom: Issei Suzuki <issei@jp.FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= ja-tcsh-nls-merril-6.08.05
CATEGORIES= japanese shells
MASTER_SITES= ${MASTER_SITE_PORTS_JP}
-MAINTAINER= issei@jp.FreeBSD.ORG
+MAINTAINER= issei@jp.FreeBSD.org
MASTERDIR= ${.CURDIR}/../tcsh-nls-generic
PKGDIR= ${.CURDIR}/pkg
diff --git a/japanese/tcsh-nls-miyakonjo/Makefile b/japanese/tcsh-nls-miyakonjo/Makefile
index 664b068..21a865c 100644
--- a/japanese/tcsh-nls-miyakonjo/Makefile
+++ b/japanese/tcsh-nls-miyakonjo/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: ja-tcsh NLS catalog (Miyakonjo)
# Version required: 6.08.05
# Date created: 6 January 1999
-# Whom: Issei Suzuki <issei@jp.FreeBSD.ORG>
+# Whom: Issei Suzuki <issei@jp.FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= ja-tcsh-nls-miyakonjo-6.08.05
CATEGORIES= japanese shells
MASTER_SITES= ${MASTER_SITE_PORTS_JP}
-MAINTAINER= issei@jp.FreeBSD.ORG
+MAINTAINER= issei@jp.FreeBSD.org
MASTERDIR= ${.CURDIR}/../tcsh-nls-generic
PKGDIR= ${.CURDIR}/pkg
diff --git a/japanese/tcsh-nls-multi/Makefile b/japanese/tcsh-nls-multi/Makefile
index 82b40c4..f7c01ac 100644
--- a/japanese/tcsh-nls-multi/Makefile
+++ b/japanese/tcsh-nls-multi/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: ja-tcsh NLS catalog (Multi)
# Version required: 6.08.05
# Date created: 19 August 1998
-# Whom: Issei Suzuki <issei@jp.FreeBSD.ORG>
+# Whom: Issei Suzuki <issei@jp.FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= ja-tcsh-nls-multi-6.08.05
CATEGORIES= japanese shells
MASTER_SITES= ${MASTER_SITE_PORTS_JP}
-MAINTAINER= issei@jp.FreeBSD.ORG
+MAINTAINER= issei@jp.FreeBSD.org
MASTERDIR= ${.CURDIR}/../tcsh-nls-generic
PKGDIR= ${.CURDIR}/pkg
diff --git a/japanese/tcsh-nls-rishu/Makefile b/japanese/tcsh-nls-rishu/Makefile
index faba21a..d8965e7 100644
--- a/japanese/tcsh-nls-rishu/Makefile
+++ b/japanese/tcsh-nls-rishu/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: ja-tcsh NLS catalog (Rishu)
# Version required: 6.08.05
# Date created: 19 August 1998
-# Whom: Issei Suzuki <issei@jp.FreeBSD.ORG>
+# Whom: Issei Suzuki <issei@jp.FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= ja-tcsh-nls-rishu-6.08.05
CATEGORIES= japanese shells
MASTER_SITES= ${MASTER_SITE_PORTS_JP}
-MAINTAINER= issei@jp.FreeBSD.ORG
+MAINTAINER= issei@jp.FreeBSD.org
MASTERDIR= ${.CURDIR}/../tcsh-nls-generic
PKGDIR= ${.CURDIR}/pkg
diff --git a/japanese/tcsh-nls-roomi/Makefile b/japanese/tcsh-nls-roomi/Makefile
index c7a04dc..1ac59d9 100644
--- a/japanese/tcsh-nls-roomi/Makefile
+++ b/japanese/tcsh-nls-roomi/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: ja-tcsh NLS catalog (Roomi)
# Version required: 6.08.05
# Date created: 19 August 1998
-# Whom: Issei Suzuki <issei@jp.FreeBSD.ORG>
+# Whom: Issei Suzuki <issei@jp.FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= ja-tcsh-nls-roomi-6.08.05
CATEGORIES= japanese shells
MASTER_SITES= ${MASTER_SITE_PORTS_JP}
-MAINTAINER= issei@jp.FreeBSD.ORG
+MAINTAINER= issei@jp.FreeBSD.org
MASTERDIR= ${.CURDIR}/../tcsh-nls-generic
PKGDIR= ${.CURDIR}/pkg
diff --git a/japanese/tcsh-nls-ruri2/Makefile b/japanese/tcsh-nls-ruri2/Makefile
index ef125da..b169360 100644
--- a/japanese/tcsh-nls-ruri2/Makefile
+++ b/japanese/tcsh-nls-ruri2/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: ja-tcsh NLS catalog (Hoshino Ruri)
# Version required: 6.08.05
# Date created: 19 August 1998
-# Whom: Issei Suzuki <issei@jp.FreeBSD.ORG>
+# Whom: Issei Suzuki <issei@jp.FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= ja-tcsh-nls-ruri2-6.08.05
CATEGORIES= japanese shells
MASTER_SITES= ${MASTER_SITE_PORTS_JP}
-MAINTAINER= issei@jp.FreeBSD.ORG
+MAINTAINER= issei@jp.FreeBSD.org
MASTERDIR= ${.CURDIR}/../tcsh-nls-generic
PKGDIR= ${.CURDIR}/pkg
diff --git a/japanese/tcsh/Makefile b/japanese/tcsh/Makefile
index 1a479b2..5c7c63a 100644
--- a/japanese/tcsh/Makefile
+++ b/japanese/tcsh/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: tcsh with multibyte support enabled
# Version required: 6.08.05
# Date created: 29 November 1997
-# Whom: Issei Suzuki <issei@jp.FreeBSD.ORG>
+# Whom: Issei Suzuki <issei@jp.FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= ja-tcsh-6.08.05
CATEGORIES= japanese shells
MASTER_SITES= ftp://ftp.astron.com/pri/
-MAINTAINER= issei@jp.FreeBSD.ORG
+MAINTAINER= issei@jp.FreeBSD.org
GNU_CONFIGURE= yes
ALL_TARGET= all catalogs
diff --git a/japanese/tvi/Makefile b/japanese/tvi/Makefile
index 9854fbc..1d28681 100644
--- a/japanese/tvi/Makefile
+++ b/japanese/tvi/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: tvi
# Version required: 0.9.2
# Date created: 3 Jan 1999
-# Whom: SUGIMURA Takashi <sugimura@jp.FreeBSD.ORG>
+# Whom: SUGIMURA Takashi <sugimura@jp.FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= ja-tvi-0.9.2
CATEGORIES= japanese
MASTER_SITES= http://www.kt.rim.or.jp/~motomu/tvi/Arc/
-MAINTAINER= sugimura@jp.FreeBSD.ORG
+MAINTAINER= sugimura@jp.FreeBSD.org
RUN_DEPENDS= wish4.2jp:${PORTSDIR}/japanese/tk42
diff --git a/japanese/xjman-3/Makefile b/japanese/xjman-3/Makefile
index 7961f68..19c8616 100644
--- a/japanese/xjman-3/Makefile
+++ b/japanese/xjman-3/Makefile
@@ -3,7 +3,7 @@
# Date created: 24 Dec 1998
# Based on: Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>'s
# japanese/man-doc
-# Whom: SADA Kenji <sada@FreeBSD.ORG>
+# Whom: SADA Kenji <sada@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,9 +12,9 @@ DISTNAME= xjman-0.3
PKGNAME= ja-xjman-0.3
CATEGORIES= japanese
MASTER_SITES= ${MASTER_SITE_PORTS_JP} \
- http://WWW.FreeBSD.ORG/~sada/distfiles/
+ http://WWW.FreeBSD.org/~sada/distfiles/
-MAINTAINER= sada@FreeBSD.ORG
+MAINTAINER= sada@FreeBSD.org
NO_MTREE= yes
PLIST= ${WRKDIR}/PLIST
diff --git a/japanese/xjman/Makefile b/japanese/xjman/Makefile
index 7961f68..19c8616 100644
--- a/japanese/xjman/Makefile
+++ b/japanese/xjman/Makefile
@@ -3,7 +3,7 @@
# Date created: 24 Dec 1998
# Based on: Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>'s
# japanese/man-doc
-# Whom: SADA Kenji <sada@FreeBSD.ORG>
+# Whom: SADA Kenji <sada@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,9 +12,9 @@ DISTNAME= xjman-0.3
PKGNAME= ja-xjman-0.3
CATEGORIES= japanese
MASTER_SITES= ${MASTER_SITE_PORTS_JP} \
- http://WWW.FreeBSD.ORG/~sada/distfiles/
+ http://WWW.FreeBSD.org/~sada/distfiles/
-MAINTAINER= sada@FreeBSD.ORG
+MAINTAINER= sada@FreeBSD.org
NO_MTREE= yes
PLIST= ${WRKDIR}/PLIST
diff --git a/japanese/xv/Makefile b/japanese/xv/Makefile
index 475fb78..401f0eb 100644
--- a/japanese/xv/Makefile
+++ b/japanese/xv/Makefile
@@ -9,7 +9,7 @@
PKGNAME= ja-xv-3.10a
CATEGORIES= japanese graphics
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
MASTERDIR= ${.CURDIR}/../../graphics/xv
PKGDIR= ${.CURDIR}/pkg
diff --git a/java/jfc/Makefile b/java/jfc/Makefile
index a820a27..ab7eae8 100644
--- a/java/jfc/Makefile
+++ b/java/jfc/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: Java Foundation Classes with Swing
# Version required: 1.1
# Date created: 17 May 1999
-# Whom: Jun Kuriyama <kuriyama@FreeBSD.ORG>
+# Whom: Jun Kuriyama <kuriyama@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= java
MASTER_SITES= http://java.sun.com/products/jfc/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= kuriyama@FreeBSD.ORG
+MAINTAINER= kuriyama@FreeBSD.org
RUN_DEPENDS= ${PREFIX}/${JAVASUBDIR}/bin/java:${PORTSDIR}/java/jdk
diff --git a/lang/STk/Makefile b/lang/STk/Makefile
index a46273d..6f44b8d 100644
--- a/lang/STk/Makefile
+++ b/lang/STk/Makefile
@@ -10,7 +10,7 @@ DISTNAME= STk-3.1.1
CATEGORIES= lang
MASTER_SITES= ftp://kaolin.unice.fr/pub/
-MAINTAINER= jmacd@FreeBSD.ORG
+MAINTAINER= jmacd@FreeBSD.org
BROKEN_ELF= yes
diff --git a/lang/TenDRA/Makefile b/lang/TenDRA/Makefile
index c05620c..c662628 100644
--- a/lang/TenDRA/Makefile
+++ b/lang/TenDRA/Makefile
@@ -10,7 +10,7 @@ DISTNAME= TenDRA-4.1.2
CATEGORIES= lang
MASTER_SITES= ftp://alph.dera.gov.uk/pub/TenDRA/
-MAINTAINER= rnordier@FreeBSD.ORG
+MAINTAINER= rnordier@FreeBSD.org
ONLY_FOR_ARCHS= i386
OSRELEASE!= uname -r
diff --git a/lang/cim/Makefile b/lang/cim/Makefile
index 8de62bf..077bea3 100644
--- a/lang/cim/Makefile
+++ b/lang/cim/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.ifi.uio.no/pub/cim/ \
${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= devel/lang/simula
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
GNU_CONFIGURE= yes
MAN1= cim.1
diff --git a/lang/eiffel/Makefile b/lang/eiffel/Makefile
index c985f73..32fa550 100644
--- a/lang/eiffel/Makefile
+++ b/lang/eiffel/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= lang
MASTER_SITES= ftp://ftp.cm.cf.ac.uk/pub/Eiffel/SIG/Eiffel-S-1.3/BSD/
EXTRACT_SUFX= .freebsd.tar.gz
-MAINTAINER= erich@FreeBSD.ORG
+MAINTAINER= erich@FreeBSD.org
WRKSRC= ${WRKDIR}/eiffel
diff --git a/lang/elk/Makefile b/lang/elk/Makefile
index 9ff3666..edf8815 100644
--- a/lang/elk/Makefile
+++ b/lang/elk/Makefile
@@ -11,7 +11,7 @@ PKGNAME= elk-3.0.3
CATEGORIES= lang
MASTER_SITES= http://www-rn.informatik.uni-bremen.de/software/elk/dist/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
USE_XLIB= yes
PATCH_STRIP= -p1
diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index 5273a6c..d2b78f2 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -10,7 +10,7 @@ CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= gawk
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
MANUAL_PACKAGE_BUILD= confuses zsh
GNU_CONFIGURE= yes
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index 3825abb..e16968a 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: gnustep
# Version required: 0.5.5
# Date created: 03 October 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= devel
MASTER_SITES= ftp://ftp.gnustep.org/pub/gnustep/core/ \
ftp://ftp.peanuts.org/Mirrors/GNUstep/gnustep/core/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff34
diff --git a/lang/gnustep-guile/Makefile b/lang/gnustep-guile/Makefile
index 3825abb..e16968a 100644
--- a/lang/gnustep-guile/Makefile
+++ b/lang/gnustep-guile/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: gnustep
# Version required: 0.5.5
# Date created: 03 October 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= devel
MASTER_SITES= ftp://ftp.gnustep.org/pub/gnustep/core/ \
ftp://ftp.peanuts.org/Mirrors/GNUstep/gnustep/core/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff34
diff --git a/lang/gnustep-objc/Makefile b/lang/gnustep-objc/Makefile
index 3825abb..e16968a 100644
--- a/lang/gnustep-objc/Makefile
+++ b/lang/gnustep-objc/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: gnustep
# Version required: 0.5.5
# Date created: 03 October 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= devel
MASTER_SITES= ftp://ftp.gnustep.org/pub/gnustep/core/ \
ftp://ftp.peanuts.org/Mirrors/GNUstep/gnustep/core/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff34
diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index fa85b43..d3db787 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: icon
# Version required: 9.3.2
# Date created: 05 April 1995
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= lang
MASTER_SITES= ftp://ftp.cs.arizona.edu/icon/packages/unix/
EXTRACT_SUFX= .tgz
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
ONLY_FOR_ARCHS= i386
diff --git a/lang/logo/Makefile b/lang/logo/Makefile
index aae84ad25..0c4ede50 100644
--- a/lang/logo/Makefile
+++ b/lang/logo/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://anarres.cs.berkeley.edu/pub/ucblogo/
MASTER_SITE_SUBDIR= ucblogo
-MAINTAINER= jmacd@FreeBSD.ORG
+MAINTAINER= jmacd@FreeBSD.org
USE_XLIB= yes
MAKEFILE= makefile
diff --git a/lang/m3gdb/Makefile b/lang/m3gdb/Makefile
index f6e66e2..6d619df 100644
--- a/lang/m3gdb/Makefile
+++ b/lang/m3gdb/Makefile
@@ -10,7 +10,7 @@ DISTNAME= m3gdb-4.17
CATEGORIES= lang devel
MASTER_SITES= http://www.freebsd.org/~jdp/distfiles/
-MAINTAINER= jdp@FreeBSD.ORG
+MAINTAINER= jdp@FreeBSD.org
MAN1= m3gdb.1
MANCOMPRESSED= yes
diff --git a/lang/mawk/Makefile b/lang/mawk/Makefile
index 5c99d41..4734dee 100644
--- a/lang/mawk/Makefile
+++ b/lang/mawk/Makefile
@@ -11,7 +11,7 @@ PKGNAME= mawk-1.3.3
CATEGORIES= lang
MASTER_SITES= ftp://ftp.whidbey.net/pub/brennan/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
WRKSRC= $(WRKDIR)/$(PKGNAME)
GNU_CONFIGURE= yes
diff --git a/lang/mit-scheme/Makefile b/lang/mit-scheme/Makefile
index 0552233..42b8808 100644
--- a/lang/mit-scheme/Makefile
+++ b/lang/mit-scheme/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: MIT-Scheme
# Version required: 7.3
# Date created: Mar 26 1995
-# Whom: jmacd@FreeBSD.ORG
+# Whom: jmacd@FreeBSD.org
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_LOCAL}
DISTFILES= scheme-microcode+dist-7.3-freebsd.tgz
-MAINTAINER= jmacd@FreeBSD.ORG
+MAINTAINER= jmacd@FreeBSD.org
BROKEN_ELF= yes
diff --git a/lang/p5-Tcl/Makefile b/lang/p5-Tcl/Makefile
index 8f16929..431fc88 100644
--- a/lang/p5-Tcl/Makefile
+++ b/lang/p5-Tcl/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= lang perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Tcl
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
LIB_DEPENDS= tcl80.1:${PORTSDIR}/lang/tcl80
diff --git a/lang/perl5.10/Makefile b/lang/perl5.10/Makefile
index 9072d9d..e77b56b 100644
--- a/lang/perl5.10/Makefile
+++ b/lang/perl5.10/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= lang devel perl5
MASTER_SITES= ftp://ftp.digital.com/pub/plan/perl/CPAN/src/5.0/ \
ftp://ftp.cdrom.com/pub/perl/CPAN/src/5.0/
-MAINTAINER= markm@FreeBSD.ORG
+MAINTAINER= markm@FreeBSD.org
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= Configure
diff --git a/lang/perl5.12/Makefile b/lang/perl5.12/Makefile
index 9072d9d..e77b56b 100644
--- a/lang/perl5.12/Makefile
+++ b/lang/perl5.12/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= lang devel perl5
MASTER_SITES= ftp://ftp.digital.com/pub/plan/perl/CPAN/src/5.0/ \
ftp://ftp.cdrom.com/pub/perl/CPAN/src/5.0/
-MAINTAINER= markm@FreeBSD.ORG
+MAINTAINER= markm@FreeBSD.org
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= Configure
diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile
index 9072d9d..e77b56b 100644
--- a/lang/perl5.14/Makefile
+++ b/lang/perl5.14/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= lang devel perl5
MASTER_SITES= ftp://ftp.digital.com/pub/plan/perl/CPAN/src/5.0/ \
ftp://ftp.cdrom.com/pub/perl/CPAN/src/5.0/
-MAINTAINER= markm@FreeBSD.ORG
+MAINTAINER= markm@FreeBSD.org
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= Configure
diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile
index 9072d9d..e77b56b 100644
--- a/lang/perl5.16/Makefile
+++ b/lang/perl5.16/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= lang devel perl5
MASTER_SITES= ftp://ftp.digital.com/pub/plan/perl/CPAN/src/5.0/ \
ftp://ftp.cdrom.com/pub/perl/CPAN/src/5.0/
-MAINTAINER= markm@FreeBSD.ORG
+MAINTAINER= markm@FreeBSD.org
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= Configure
diff --git a/lang/perl5.6/Makefile b/lang/perl5.6/Makefile
index 9072d9d..e77b56b 100644
--- a/lang/perl5.6/Makefile
+++ b/lang/perl5.6/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= lang devel perl5
MASTER_SITES= ftp://ftp.digital.com/pub/plan/perl/CPAN/src/5.0/ \
ftp://ftp.cdrom.com/pub/perl/CPAN/src/5.0/
-MAINTAINER= markm@FreeBSD.ORG
+MAINTAINER= markm@FreeBSD.org
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= Configure
diff --git a/lang/perl5.8/Makefile b/lang/perl5.8/Makefile
index 9072d9d..e77b56b 100644
--- a/lang/perl5.8/Makefile
+++ b/lang/perl5.8/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= lang devel perl5
MASTER_SITES= ftp://ftp.digital.com/pub/plan/perl/CPAN/src/5.0/ \
ftp://ftp.cdrom.com/pub/perl/CPAN/src/5.0/
-MAINTAINER= markm@FreeBSD.ORG
+MAINTAINER= markm@FreeBSD.org
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= Configure
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 9072d9d..e77b56b 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= lang devel perl5
MASTER_SITES= ftp://ftp.digital.com/pub/plan/perl/CPAN/src/5.0/ \
ftp://ftp.cdrom.com/pub/perl/CPAN/src/5.0/
-MAINTAINER= markm@FreeBSD.ORG
+MAINTAINER= markm@FreeBSD.org
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= Configure
diff --git a/lang/python+ipv6/Makefile b/lang/python+ipv6/Makefile
index 135e6b6..8351705 100644
--- a/lang/python+ipv6/Makefile
+++ b/lang/python+ipv6/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \
ftp://ftp.cwi.nl/pub/python/src/
EXTRACT_SUFX= .tgz
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
LIB_DEPENDS= ${TK_DEPENDS}
diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile
index 135e6b6..8351705 100644
--- a/lang/python-devel/Makefile
+++ b/lang/python-devel/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \
ftp://ftp.cwi.nl/pub/python/src/
EXTRACT_SUFX= .tgz
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
LIB_DEPENDS= ${TK_DEPENDS}
diff --git a/lang/python-doc-html/Makefile b/lang/python-doc-html/Makefile
index 6f65c18..b23109f 100644
--- a/lang/python-doc-html/Makefile
+++ b/lang/python-doc-html/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: python-doc
# Version required: 1.5.2
# Date created: 12 May 1999
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://www.python.org/pub/python/doc/1.5.2/ \
ftp://ftp.cwi.nl/pub/python/doc/1.5.2/
EXTRACT_SUFX= .tgz
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
DIST_SUBDIR= python
NO_BUILD= yes
diff --git a/lang/python-doc-pdf-a4/Makefile b/lang/python-doc-pdf-a4/Makefile
index 7237a70..d891810 100644
--- a/lang/python-doc-pdf-a4/Makefile
+++ b/lang/python-doc-pdf-a4/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: python-doc-pdf-a4
# Version required: 1.5.2
# Date created: 02 June 1999
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $Id4
#
diff --git a/lang/python-doc-pdf-letter/Makefile b/lang/python-doc-pdf-letter/Makefile
index d77ada6..41880b6 100644
--- a/lang/python-doc-pdf-letter/Makefile
+++ b/lang/python-doc-pdf-letter/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: python-doc-pdf-letter
# Version required: 1.5.2
# Date created: 02 June 1999
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $Id4
#
diff --git a/lang/python-doc-postscript-a4/Makefile b/lang/python-doc-postscript-a4/Makefile
index 02d7764..6112883 100644
--- a/lang/python-doc-postscript-a4/Makefile
+++ b/lang/python-doc-postscript-a4/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: python-doc-postscript-a4
# Version required: 1.5.2
# Date created: 02 June 1999
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $Id4
#
diff --git a/lang/python-doc-postscript-letter/Makefile b/lang/python-doc-postscript-letter/Makefile
index 61dfeeb..d55b218 100644
--- a/lang/python-doc-postscript-letter/Makefile
+++ b/lang/python-doc-postscript-letter/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: python-doc-postscript-letter
# Version required: 1.5.2
# Date created: 02 June 1999
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $Id4
#
diff --git a/lang/python/Makefile b/lang/python/Makefile
index 135e6b6..8351705 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \
ftp://ftp.cwi.nl/pub/python/src/
EXTRACT_SUFX= .tgz
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
LIB_DEPENDS= ${TK_DEPENDS}
diff --git a/lang/python15/Makefile b/lang/python15/Makefile
index 135e6b6..8351705 100644
--- a/lang/python15/Makefile
+++ b/lang/python15/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \
ftp://ftp.cwi.nl/pub/python/src/
EXTRACT_SUFX= .tgz
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
LIB_DEPENDS= ${TK_DEPENDS}
diff --git a/lang/python20/Makefile b/lang/python20/Makefile
index 135e6b6..8351705 100644
--- a/lang/python20/Makefile
+++ b/lang/python20/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \
ftp://ftp.cwi.nl/pub/python/src/
EXTRACT_SUFX= .tgz
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
LIB_DEPENDS= ${TK_DEPENDS}
diff --git a/lang/python21/Makefile b/lang/python21/Makefile
index 135e6b6..8351705 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \
ftp://ftp.cwi.nl/pub/python/src/
EXTRACT_SUFX= .tgz
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
LIB_DEPENDS= ${TK_DEPENDS}
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index 135e6b6..8351705 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \
ftp://ftp.cwi.nl/pub/python/src/
EXTRACT_SUFX= .tgz
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
LIB_DEPENDS= ${TK_DEPENDS}
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index 135e6b6..8351705 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \
ftp://ftp.cwi.nl/pub/python/src/
EXTRACT_SUFX= .tgz
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
LIB_DEPENDS= ${TK_DEPENDS}
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 135e6b6..8351705 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \
ftp://ftp.cwi.nl/pub/python/src/
EXTRACT_SUFX= .tgz
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
LIB_DEPENDS= ${TK_DEPENDS}
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index 135e6b6..8351705 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \
ftp://ftp.cwi.nl/pub/python/src/
EXTRACT_SUFX= .tgz
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
LIB_DEPENDS= ${TK_DEPENDS}
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index 135e6b6..8351705 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \
ftp://ftp.cwi.nl/pub/python/src/
EXTRACT_SUFX= .tgz
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
LIB_DEPENDS= ${TK_DEPENDS}
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 135e6b6..8351705 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \
ftp://ftp.cwi.nl/pub/python/src/
EXTRACT_SUFX= .tgz
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
LIB_DEPENDS= ${TK_DEPENDS}
diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index 135e6b6..8351705 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \
ftp://ftp.cwi.nl/pub/python/src/
EXTRACT_SUFX= .tgz
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
LIB_DEPENDS= ${TK_DEPENDS}
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index 135e6b6..8351705 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \
ftp://ftp.cwi.nl/pub/python/src/
EXTRACT_SUFX= .tgz
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
LIB_DEPENDS= ${TK_DEPENDS}
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index 135e6b6..8351705 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \
ftp://ftp.cwi.nl/pub/python/src/
EXTRACT_SUFX= .tgz
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
LIB_DEPENDS= ${TK_DEPENDS}
diff --git a/lang/rexx-imc/Makefile b/lang/rexx-imc/Makefile
index 4310f7b..b2187eb 100644
--- a/lang/rexx-imc/Makefile
+++ b/lang/rexx-imc/Makefile
@@ -10,7 +10,7 @@ DISTNAME= rexx-imc-1.6d
CATEGORIES= lang
MASTER_SITES= http://www.comlab.ox.ac.uk/oucl/users/ian.collier/distribution/
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
NO_WRKSUBDIR= YES
diff --git a/lang/scheme48/Makefile b/lang/scheme48/Makefile
index f3a0b20..58a613d 100644
--- a/lang/scheme48/Makefile
+++ b/lang/scheme48/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= lang
MASTER_SITES= ftp://ftp-swiss.ai.mit.edu/pub/s48/
EXTRACT_SUFX= .tgz
-MAINTAINER= jmacd@FreeBSD.ORG
+MAINTAINER= jmacd@FreeBSD.org
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX}
diff --git a/lang/schemetoc/Makefile b/lang/schemetoc/Makefile
index d258f8f..0405304 100644
--- a/lang/schemetoc/Makefile
+++ b/lang/schemetoc/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= lang
MASTER_SITES= ftp://gatekeeper.dec.com/pub/DEC/Scheme-to-C/
DISTFILES= 15mar93.tar.Z
-MAINTAINER= jmacd@FreeBSD.ORG
+MAINTAINER= jmacd@FreeBSD.org
BROKEN_ELF= yes
diff --git a/lang/siod/Makefile b/lang/siod/Makefile
index 83faabf..91f15da 100644
--- a/lang/siod/Makefile
+++ b/lang/siod/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://people.delphi.com/gjc/\
ftp://ftp.std.com/pub/gjc/
EXTRACT_SUFX= .tgz
-MAINTAINER= jkoshy@FreeBSD.ORG
+MAINTAINER= jkoshy@FreeBSD.org
NO_WRKSUBDIR= true
MAKEFILE= makefile
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index b38014b..0ea180c 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= smalltalk
-MAINTAINER= jraynard@FreeBSD.ORG
+MAINTAINER= jraynard@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
diff --git a/lang/swi-pl/Makefile b/lang/swi-pl/Makefile
index 64a191b..febf237 100644
--- a/lang/swi-pl/Makefile
+++ b/lang/swi-pl/Makefile
@@ -11,7 +11,7 @@ PKGNAME= swi-pl-3.2.9
CATEGORIES= lang
MASTER_SITES= ftp://swi.psy.uva.nl/pub/SWI-Prolog/
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
Y2K= http://www.hio.hen.nl/faq/SWI-Prolog.html#7.__warranty
diff --git a/lang/tcl81-thread/Makefile b/lang/tcl81-thread/Makefile
index 75a34d3..d3f4dcf 100644
--- a/lang/tcl81-thread/Makefile
+++ b/lang/tcl81-thread/Makefile
@@ -11,7 +11,7 @@ PKGNAME= tcl-8.1.b1-thread
CATEGORIES= lang tcl81
MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
-MAINTAINER= ejc@FreeBSD.ORG
+MAINTAINER= ejc@FreeBSD.org
Y2K= http://www.scriptics.com/Y2K.html
diff --git a/lang/tcl82/Makefile b/lang/tcl82/Makefile
index 9cb3c5d..9c8bf65 100644
--- a/lang/tcl82/Makefile
+++ b/lang/tcl82/Makefile
@@ -11,7 +11,7 @@ PKGNAME= tcl-8.1.1
CATEGORIES= lang tcl81
MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
-MAINTAINER= jseger@FreeBSD.ORG
+MAINTAINER= jseger@FreeBSD.org
Y2K= http://www.scriptics.com/Y2K.html
diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile
index 9cb3c5d..9c8bf65 100644
--- a/lang/tcl83/Makefile
+++ b/lang/tcl83/Makefile
@@ -11,7 +11,7 @@ PKGNAME= tcl-8.1.1
CATEGORIES= lang tcl81
MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
-MAINTAINER= jseger@FreeBSD.ORG
+MAINTAINER= jseger@FreeBSD.org
Y2K= http://www.scriptics.com/Y2K.html
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index 9cb3c5d..9c8bf65 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -11,7 +11,7 @@ PKGNAME= tcl-8.1.1
CATEGORIES= lang tcl81
MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
-MAINTAINER= jseger@FreeBSD.ORG
+MAINTAINER= jseger@FreeBSD.org
Y2K= http://www.scriptics.com/Y2K.html
diff --git a/lang/tclX/Makefile b/lang/tclX/Makefile
index f48d59a..472f21d 100644
--- a/lang/tclX/Makefile
+++ b/lang/tclX/Makefile
@@ -11,7 +11,7 @@ PKGNAME= tclX-8.0.2
CATEGORIES= lang tcl80 tk80
MASTER_SITES= ftp://ftp.neosoft.com/pub/tcl/tclx-distrib/
-MAINTAINER= jseger@FreeBSD.ORG
+MAINTAINER= jseger@FreeBSD.org
LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
diff --git a/lang/tclX80/Makefile b/lang/tclX80/Makefile
index f48d59a..472f21d 100644
--- a/lang/tclX80/Makefile
+++ b/lang/tclX80/Makefile
@@ -11,7 +11,7 @@ PKGNAME= tclX-8.0.2
CATEGORIES= lang tcl80 tk80
MASTER_SITES= ftp://ftp.neosoft.com/pub/tcl/tclx-distrib/
-MAINTAINER= jseger@FreeBSD.ORG
+MAINTAINER= jseger@FreeBSD.org
LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
diff --git a/lang/tclX82/Makefile b/lang/tclX82/Makefile
index f48d59a..472f21d 100644
--- a/lang/tclX82/Makefile
+++ b/lang/tclX82/Makefile
@@ -11,7 +11,7 @@ PKGNAME= tclX-8.0.2
CATEGORIES= lang tcl80 tk80
MASTER_SITES= ftp://ftp.neosoft.com/pub/tcl/tclx-distrib/
-MAINTAINER= jseger@FreeBSD.ORG
+MAINTAINER= jseger@FreeBSD.org
LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
diff --git a/lang/tclplugin/Makefile b/lang/tclplugin/Makefile
index ae548ea..877d44f 100644
--- a/lang/tclplugin/Makefile
+++ b/lang/tclplugin/Makefile
@@ -11,7 +11,7 @@ PKGNAME= tclplugin-2.0
CATEGORIES= lang
MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/plugin/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
BROKEN_ELF= yes
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 41d19ee..7b14025 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= mail gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/balsa
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore
LIB_DEPENDS= gnome.2:${PORTSDIR}/x11/gnomelibs \
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index 41d19ee..7b14025 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= mail gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/balsa
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore
LIB_DEPENDS= gnome.2:${PORTSDIR}/x11/gnomelibs \
diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile
index aba121e..e71bde0 100644
--- a/mail/cucipop/Makefile
+++ b/mail/cucipop/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.informatik.rwth-aachen.de/pub/packages/cucipop/
#BUILD_DEPENDS= ${PREFIX}/include/db2/db.h:${PORTSDIR}/databases/db
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
MAN8= cucipop.8 #makevpopdb.8
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 444dbc8..7cb7974 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: cyrus
# Version required: 1.5.19
# Date created: May 4th 1997
-# Whom: jfitz@FreeBSD.ORG
+# Whom: jfitz@FreeBSD.org
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
http://www.freebsd.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
-MAINTAINER= stb@FreeBSD.ORG
+MAINTAINER= stb@FreeBSD.org
Y2K= http://andrew2.andrew.cmu.edu/cyrus/imapd/y2k.html
diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile
index 444dbc8..7cb7974 100644
--- a/mail/cyrus-imapd2/Makefile
+++ b/mail/cyrus-imapd2/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: cyrus
# Version required: 1.5.19
# Date created: May 4th 1997
-# Whom: jfitz@FreeBSD.ORG
+# Whom: jfitz@FreeBSD.org
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
http://www.freebsd.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
-MAINTAINER= stb@FreeBSD.ORG
+MAINTAINER= stb@FreeBSD.org
Y2K= http://andrew2.andrew.cmu.edu/cyrus/imapd/y2k.html
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 444dbc8..7cb7974 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: cyrus
# Version required: 1.5.19
# Date created: May 4th 1997
-# Whom: jfitz@FreeBSD.ORG
+# Whom: jfitz@FreeBSD.org
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
http://www.freebsd.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
-MAINTAINER= stb@FreeBSD.ORG
+MAINTAINER= stb@FreeBSD.org
Y2K= http://andrew2.andrew.cmu.edu/cyrus/imapd/y2k.html
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 444dbc8..7cb7974 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: cyrus
# Version required: 1.5.19
# Date created: May 4th 1997
-# Whom: jfitz@FreeBSD.ORG
+# Whom: jfitz@FreeBSD.org
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
http://www.freebsd.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
-MAINTAINER= stb@FreeBSD.ORG
+MAINTAINER= stb@FreeBSD.org
Y2K= http://andrew2.andrew.cmu.edu/cyrus/imapd/y2k.html
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 444dbc8..7cb7974 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: cyrus
# Version required: 1.5.19
# Date created: May 4th 1997
-# Whom: jfitz@FreeBSD.ORG
+# Whom: jfitz@FreeBSD.org
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
http://www.freebsd.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
-MAINTAINER= stb@FreeBSD.ORG
+MAINTAINER= stb@FreeBSD.org
Y2K= http://andrew2.andrew.cmu.edu/cyrus/imapd/y2k.html
diff --git a/mail/cyrus/Makefile b/mail/cyrus/Makefile
index 444dbc8..7cb7974 100644
--- a/mail/cyrus/Makefile
+++ b/mail/cyrus/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: cyrus
# Version required: 1.5.19
# Date created: May 4th 1997
-# Whom: jfitz@FreeBSD.ORG
+# Whom: jfitz@FreeBSD.org
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
http://www.freebsd.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
-MAINTAINER= stb@FreeBSD.ORG
+MAINTAINER= stb@FreeBSD.org
Y2K= http://andrew2.andrew.cmu.edu/cyrus/imapd/y2k.html
diff --git a/mail/distribute/Makefile b/mail/distribute/Makefile
index 91f0788..1b64fe9 100644
--- a/mail/distribute/Makefile
+++ b/mail/distribute/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.foretune.co.jp/pub/network/mail/distribute/
PATCH_SITES= ${MASTER_SITES}BETA/
PATCHFILES= patch.20.gz patch.21e.gz patch.22e.gz patch.23e.gz patch.24e.gz
-MAINTAINER= kuriyama@FreeBSD.ORG
+MAINTAINER= kuriyama@FreeBSD.org
WRKSRC= ${WRKDIR}/distribute-pl19
MAN1= distribute.1
diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index f9386e2..c8becad 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.ozone.fmi.fi/KEH/ \
ftp://ftp.funet.fi/pub/unix/mail/elm/elm-2.4ME+/ \
ftp://ftp.ibp.fr/pub/unix/mail/elm-me/
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
WRKSRC= ${WRKDIR}/elm2.4.ME+.54
MAN1= answer.1 checkalias.1 elm.1 elmalias.1 fastmail.1 \
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index f9386e2..c8becad 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.ozone.fmi.fi/KEH/ \
ftp://ftp.funet.fi/pub/unix/mail/elm/elm-2.4ME+/ \
ftp://ftp.ibp.fr/pub/unix/mail/elm-me/
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
WRKSRC= ${WRKDIR}/elm2.4.ME+.54
MAN1= answer.1 checkalias.1 elm.1 elmalias.1 fastmail.1 \
diff --git a/mail/exim-devel/Makefile b/mail/exim-devel/Makefile
index 2dae3b5..113af3b 100644
--- a/mail/exim-devel/Makefile
+++ b/mail/exim-devel/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: exim
# Version required: 3.03
# Date created: 23 June 1996
-# Whom: markm@FreeBSD.ORG
+# Whom: markm@FreeBSD.org
#
# $FreeBSD$
#
diff --git a/mail/exim-old/Makefile b/mail/exim-old/Makefile
index 2dae3b5..113af3b 100644
--- a/mail/exim-old/Makefile
+++ b/mail/exim-old/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: exim
# Version required: 3.03
# Date created: 23 June 1996
-# Whom: markm@FreeBSD.ORG
+# Whom: markm@FreeBSD.org
#
# $FreeBSD$
#
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 2dae3b5..113af3b 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: exim
# Version required: 3.03
# Date created: 23 June 1996
-# Whom: markm@FreeBSD.ORG
+# Whom: markm@FreeBSD.org
#
# $FreeBSD$
#
diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index e2a109a..6e3ca89 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -2,7 +2,7 @@
# Version required: 1.6.1
# Date created: 09 December 96
# Whom: Lars Koeller <Lars_Koeller@odie.physik2.uni-rostock.de>
-# Andreas Klemm <andreas@FreeBSD.ORG>
+# Andreas Klemm <andreas@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index ff43daf..875d28e 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -10,7 +10,7 @@ DISTNAME= kbiff-2.3
CATEGORIES= mail kde
MASTER_SITES= http://home.sprintmail.com/~granroth/kbiff/
-MAINTAINER= kris@FreeBSD.ORG
+MAINTAINER= kris@FreeBSD.org
LIB_DEPENDS= kdeui.2:${PORTSDIR}/x11/kdelibs11 \
intl.1:${PORTSDIR}/devel/gettext
diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile
index ca4a901..7af9a78 100644
--- a/mail/mailagent/Makefile
+++ b/mail/mailagent/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: mailagent
# Version required: 3.0pl65
# Date created: 23 Sep 1996
-# Whom: Masafumi NAKANE <max@FreeBSD.ORG>
+# Whom: Masafumi NAKANE <max@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= ../../authors/id/RAM
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
USE_PERL5= yes
NO_PACKAGE= "Correct FQDN needs to be hardcoded"
diff --git a/mail/mailx/Makefile b/mail/mailx/Makefile
index 0879701..d4a191b 100644
--- a/mail/mailx/Makefile
+++ b/mail/mailx/Makefile
@@ -17,7 +17,7 @@ PATCH_SITES= ftp://ports.jp.freebsd.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/ \
PATCHFILES= mailx.v05.patch.gz
PATCH_DIST_STRIP= -p1
-MAINTAINER= issei@jp.FreeBSD.ORG
+MAINTAINER= issei@jp.FreeBSD.org
EXTRACT_ONLY= mail-2.2.8.tar.gz
WRKSRC= ${WRKDIR}/mail-2.2.8
diff --git a/mail/majorcool/Makefile b/mail/majorcool/Makefile
index 255c5e7..e2cd38f 100644
--- a/mail/majorcool/Makefile
+++ b/mail/majorcool/Makefile
@@ -11,7 +11,7 @@ PKGNAME= majorcool-1.3.0
CATEGORIES= mail
MASTER_SITES= http://ncrinfo.ncr.com/pub/contrib/unix/MajorCool/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
NO_BUILD= yes
NO_PACKAGE= "Too many questions"
diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index 01b4815..5dd4f19 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: majordomo
# Version required: 1.94.4
# Date created: 23 October 1996
-# Whom: jfitz@FreeBSD.ORG
+# Whom: jfitz@FreeBSD.org
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.sgi.com/other/majordomo/1.94.4/ \
# ftp://ftp.greatcircle.com/pub/majordomo/1.94.3/ \
EXTRACT_SUFX= .tgz
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
Y2K= http://www.greatcircle.com/majordomo/majordomo-faq.html#1.8
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index a54ab4f..eddc5a1 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= mail
MASTER_SITES= ftp://thumper.bellcore.com/pub/nsb/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
USE_XLIB= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/src
diff --git a/mail/mh/Makefile b/mail/mh/Makefile
index f9b9ace..45d4ad5 100644
--- a/mail/mh/Makefile
+++ b/mail/mh/Makefile
@@ -15,7 +15,7 @@ EXTRACT_SUFX= .tar.Z
PATCH_SITES= ftp://ftp.ics.uci.edu/pub/mh/updates/
PATCHFILES= MH.6.8.4.Z
-MAINTAINER= pst@FreeBSD.ORG
+MAINTAINER= pst@FreeBSD.org
MAN1= ali.1 anno.1 burst.1 comp.1 dist.1 folder.1 forw.1 inc.1 mark.1 \
mh-chart.1 mh.1 mhl.1 mhook.1 mhmail.1 mhn.1 mhparam.1 mhpath.1 \
diff --git a/mail/movemail/Makefile b/mail/movemail/Makefile
index d7ee598..1d77509 100644
--- a/mail/movemail/Makefile
+++ b/mail/movemail/Makefile
@@ -10,7 +10,7 @@ DISTNAME= movemail-1.0
CATEGORIES= mail
MASTER_SITES= http://www.freebsd.org/~wosch/src/
-MAINTAINER= wosch@FreeBSD.ORG
+MAINTAINER= wosch@FreeBSD.org
MAN1= movemail.1
MANCOMPRESSED= maybe
diff --git a/mail/p5-MIME-Tools/Makefile b/mail/p5-MIME-Tools/Makefile
index 0807833..91132ff 100644
--- a/mail/p5-MIME-Tools/Makefile
+++ b/mail/p5-MIME-Tools/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: p5-MIME-Tools
# Version required: 4.122
# Date created: April 27th 1998
-# Whom: Eivind Eklund <eivind@FreeBSD.ORG>
+# Whom: Eivind Eklund <eivind@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= mail perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= MIME
-MAINTAINER= eivind@FreeBSD.ORG
+MAINTAINER= eivind@FreeBSD.org
RUN_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Mail/Header.pm:${PORTSDIR}/mail/p5-Mail-Tools \
${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
diff --git a/mail/p5-Mail-Folder/Makefile b/mail/p5-Mail-Folder/Makefile
index da1d110..5b09db2 100644
--- a/mail/p5-Mail-Folder/Makefile
+++ b/mail/p5-Mail-Folder/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= mail perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Mail
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate \
diff --git a/mail/p5-Mail-POP3Client/Makefile b/mail/p5-Mail-POP3Client/Makefile
index f2327d0..2ce7157 100644
--- a/mail/p5-Mail-POP3Client/Makefile
+++ b/mail/p5-Mail-POP3Client/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= mail perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Mail
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/mail/p5-Mail-Tools/Makefile b/mail/p5-Mail-Tools/Makefile
index 7e70795..25c0a23 100644
--- a/mail/p5-Mail-Tools/Makefile
+++ b/mail/p5-Mail-Tools/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= mail perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Mail
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net \
${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Net/Domain.pm:${PORTSDIR}/net/p5-Net
diff --git a/mail/pgpsendmail/Makefile b/mail/pgpsendmail/Makefile
index 02193bb..0b1ccc4 100644
--- a/mail/pgpsendmail/Makefile
+++ b/mail/pgpsendmail/Makefile
@@ -11,7 +11,7 @@ PKGNAME= pgpsendmail-1.4
CATEGORIES= mail
MASTER_SITES= ftp://ftp.dhp.com/pub/crypto/pgp/PGPsendmail/
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
BUILD_DEPENDS += pgp:${PORTSDIR}/security/pgp
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index dab678f..552b4df 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
ALL_TARGET= default
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index dab678f..552b4df 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
ALL_TARGET= default
diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile
index dab678f..552b4df 100644
--- a/mail/postfix1/Makefile
+++ b/mail/postfix1/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
ALL_TARGET= default
diff --git a/mail/postfix20/Makefile b/mail/postfix20/Makefile
index dab678f..552b4df 100644
--- a/mail/postfix20/Makefile
+++ b/mail/postfix20/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
ALL_TARGET= default
diff --git a/mail/postfix21/Makefile b/mail/postfix21/Makefile
index dab678f..552b4df 100644
--- a/mail/postfix21/Makefile
+++ b/mail/postfix21/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
ALL_TARGET= default
diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile
index dab678f..552b4df 100644
--- a/mail/postfix22/Makefile
+++ b/mail/postfix22/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
ALL_TARGET= default
diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile
index dab678f..552b4df 100644
--- a/mail/postfix23/Makefile
+++ b/mail/postfix23/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
ALL_TARGET= default
diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile
index dab678f..552b4df 100644
--- a/mail/postfix24/Makefile
+++ b/mail/postfix24/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
ALL_TARGET= default
diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile
index dab678f..552b4df 100644
--- a/mail/postfix25/Makefile
+++ b/mail/postfix25/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
ALL_TARGET= default
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
index dab678f..552b4df 100644
--- a/mail/postfix26/Makefile
+++ b/mail/postfix26/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
ALL_TARGET= default
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
index dab678f..552b4df 100644
--- a/mail/postfix27/Makefile
+++ b/mail/postfix27/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
ALL_TARGET= default
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
index dab678f..552b4df 100644
--- a/mail/postfix28/Makefile
+++ b/mail/postfix28/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
ALL_TARGET= default
diff --git a/mail/premail/Makefile b/mail/premail/Makefile
index d121437..9498a4d 100644
--- a/mail/premail/Makefile
+++ b/mail/premail/Makefile
@@ -13,7 +13,7 @@ CATEGORIES= security mail
MASTER_SITES= ftp://ftp.jpunix.com/pub/remailer-tools/ \
ftp://ftp.kiarchive.ru/unix/crypto/
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
BUILD_DEPENDS+= pgp:${PORTSDIR}/security/pgp
diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index 1227762..4611c90 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= mail
MASTER_SITES= ftp://ftp.procmail.org/pub/procmail/ \
ftp://ftp.informatik.rwth-aachen.de/pub/packages/procmail/
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
INSTALL_TARGET= install-suid install.man
diff --git a/mail/smail/Makefile b/mail/smail/Makefile
index 8701e4a..20a72af 100644
--- a/mail/smail/Makefile
+++ b/mail/smail/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.uu.net/networking/mail/smail/ \
ftp://ftp.planix.com/pub/Smail/ \
ftp://ftp.fu-berlin.de/unix/mail/smail/
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/libident.a:${PORTSDIR}/security/libident
.if !exists(/usr/include/tcpd.h)
diff --git a/mail/xfaces/Makefile b/mail/xfaces/Makefile
index d230f1e..14bb1d3 100644
--- a/mail/xfaces/Makefile
+++ b/mail/xfaces/Makefile
@@ -3,7 +3,7 @@
# Date created: 11 December 96
# Whom: Lars Koeller <Lars_Koeller@odie.physik2.uni-rostock.de>
# With some
-# modifications from: Andreas Klemm <andreas@FreeBSD.ORG>
+# modifications from: Andreas Klemm <andreas@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/mail/xmail/Makefile b/mail/xmail/Makefile
index 9b22af8..3a1829f 100644
--- a/mail/xmail/Makefile
+++ b/mail/xmail/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/mail/youbin/Makefile b/mail/youbin/Makefile
index 6218958..f126895 100644
--- a/mail/youbin/Makefile
+++ b/mail/youbin/Makefile
@@ -2,7 +2,7 @@
# http://www.agusa.nuie.nagoya-u.ac.jp/software/youbin/youbin-e.html
# Version required: 2.13
# Date created: 09 Aug 1996
-# Whom: Masafumi NAKANE <max@FreeBSD.ORG>
+# Whom: Masafumi NAKANE <max@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= mail
MASTER_SITES= ftp://nuis.nuie.nagoya-u.ac.jp/info/nagoya-u/ \
ftp://ftp.kyoto.wide.ad.jp/pub/net/
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/math/hexcalc/Makefile b/math/hexcalc/Makefile
index df853f9..03210d6 100644
--- a/math/hexcalc/Makefile
+++ b/math/hexcalc/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= math
MASTER_SITES= ftp://aixpdslib.seas.ucla.edu/pub/hexcalc/RISC/3.2/src/
EXTRACT_SUFX= ..tar.Z
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
USE_IMAKE= yes
MAN1= hexcalc.1
diff --git a/math/librandlib/Makefile b/math/librandlib/Makefile
index 18ac99d..0d497dd 100644
--- a/math/librandlib/Makefile
+++ b/math/librandlib/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: ranlib
# Version required: ?
# Date created: 06 April 1997
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= ranlib-1.0
CATEGORIES= math
MASTER_SITES= ftp://ftp.netlib.org/random/
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
WRKSRC= ${WRKDIR}/${DISTNAME}/src
diff --git a/math/libranlib/Makefile b/math/libranlib/Makefile
index 18ac99d..0d497dd 100644
--- a/math/libranlib/Makefile
+++ b/math/libranlib/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: ranlib
# Version required: ?
# Date created: 06 April 1997
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= ranlib-1.0
CATEGORIES= math
MASTER_SITES= ftp://ftp.netlib.org/random/
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
WRKSRC= ${WRKDIR}/${DISTNAME}/src
diff --git a/math/numpy/Makefile b/math/numpy/Makefile
index 3562c75..51524f9 100644
--- a/math/numpy/Makefile
+++ b/math/numpy/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: numpy
# Version required: 1.8
# Date created: 20 April 1997
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= math python
MASTER_SITES= ftp://ftp-icf.llnl.gov/pub/python/
EXTRACT_SUFX= .tgz
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
BUILD_DEPENDS= python:${PORTSDIR}/lang/python
RUN_DEPENDS= python:${PORTSDIR}/lang/python
diff --git a/math/octave-devel/Makefile b/math/octave-devel/Makefile
index e9ac29d..8ebed25 100644
--- a/math/octave-devel/Makefile
+++ b/math/octave-devel/Makefile
@@ -10,7 +10,7 @@ DISTNAME= octave-2.0.13
CATEGORIES= math
MASTER_SITES= ftp://ftp.che.wisc.edu/pub/octave/
-MAINTAINER= chuckr@FreeBSD.ORG
+MAINTAINER= chuckr@FreeBSD.org
BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
diff --git a/math/octave/Makefile b/math/octave/Makefile
index e9ac29d..8ebed25 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -10,7 +10,7 @@ DISTNAME= octave-2.0.13
CATEGORIES= math
MASTER_SITES= ftp://ftp.che.wisc.edu/pub/octave/
-MAINTAINER= chuckr@FreeBSD.ORG
+MAINTAINER= chuckr@FreeBSD.org
BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
diff --git a/math/oleo/Makefile b/math/oleo/Makefile
index af85539..1852d68 100644
--- a/math/oleo/Makefile
+++ b/math/oleo/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= oleo
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
HAS_CONFIGURE= yes
MAN1= oleo.1
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index 3791c31..d6ca5cb 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: plplot
# Version required: 4p99j
# Date created: 03 Oct 1997
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= plplot-4.99j
CATEGORIES= math
MASTER_SITES= ftp://dino.ph.utexas.edu/plplot/distrib/alpha/
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
USE_XLIB= yes
GNU_CONFIGURE= yes
diff --git a/math/py-numeric/Makefile b/math/py-numeric/Makefile
index 3562c75..51524f9 100644
--- a/math/py-numeric/Makefile
+++ b/math/py-numeric/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: numpy
# Version required: 1.8
# Date created: 20 April 1997
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= math python
MASTER_SITES= ftp://ftp-icf.llnl.gov/pub/python/
EXTRACT_SUFX= .tgz
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
BUILD_DEPENDS= python:${PORTSDIR}/lang/python
RUN_DEPENDS= python:${PORTSDIR}/lang/python
diff --git a/math/py-numeric17/Makefile b/math/py-numeric17/Makefile
index 3562c75..51524f9 100644
--- a/math/py-numeric17/Makefile
+++ b/math/py-numeric17/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: numpy
# Version required: 1.8
# Date created: 20 April 1997
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= math python
MASTER_SITES= ftp://ftp-icf.llnl.gov/pub/python/
EXTRACT_SUFX= .tgz
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
BUILD_DEPENDS= python:${PORTSDIR}/lang/python
RUN_DEPENDS= python:${PORTSDIR}/lang/python
diff --git a/math/pygist/Makefile b/math/pygist/Makefile
index 0a089f4..3f860d2 100644
--- a/math/pygist/Makefile
+++ b/math/pygist/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: pygist
# Version required: 1.5
# Date created: 30 May 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= math python
MASTER_SITES= ftp://ftp-icf.llnl.gov/pub/python/
EXTRACT_SUFX= .tgz
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
BUILD_DEPENDS= python:${PORTSDIR}/lang/python \
${PREFIX}/lib/yorick/1.4/lib/libgist.a:${PORTSDIR}/lang/yorick \
diff --git a/math/randlib/Makefile b/math/randlib/Makefile
index 18ac99d..0d497dd 100644
--- a/math/randlib/Makefile
+++ b/math/randlib/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: ranlib
# Version required: ?
# Date created: 06 April 1997
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= ranlib-1.0
CATEGORIES= math
MASTER_SITES= ftp://ftp.netlib.org/random/
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
WRKSRC= ${WRKDIR}/${DISTNAME}/src
diff --git a/math/vtk/Makefile b/math/vtk/Makefile
index c9e7558..272dc20 100644
--- a/math/vtk/Makefile
+++ b/math/vtk/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: vtk
# Version required: 2.3
# Date created: 24 Nov 1997
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= vtk-2.3
CATEGORIES= math
MASTER_SITES= ftp://vtk.scorec.rpi.edu/pub/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= GL.14:${PORTSDIR}/graphics/Mesa3 \
tk80.1:${PORTSDIR}/x11-toolkits/tk80
diff --git a/math/vtk43/Makefile b/math/vtk43/Makefile
index c9e7558..272dc20 100644
--- a/math/vtk43/Makefile
+++ b/math/vtk43/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: vtk
# Version required: 2.3
# Date created: 24 Nov 1997
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= vtk-2.3
CATEGORIES= math
MASTER_SITES= ftp://vtk.scorec.rpi.edu/pub/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= GL.14:${PORTSDIR}/graphics/Mesa3 \
tk80.1:${PORTSDIR}/x11-toolkits/tk80
diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile
index c9e7558..272dc20 100644
--- a/math/vtk5/Makefile
+++ b/math/vtk5/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: vtk
# Version required: 2.3
# Date created: 24 Nov 1997
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= vtk-2.3
CATEGORIES= math
MASTER_SITES= ftp://vtk.scorec.rpi.edu/pub/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= GL.14:${PORTSDIR}/graphics/Mesa3 \
tk80.1:${PORTSDIR}/x11-toolkits/tk80
diff --git a/math/xgraph/Makefile b/math/xgraph/Makefile
index cc089ca..2fbcf07 100644
--- a/math/xgraph/Makefile
+++ b/math/xgraph/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.iis.u-tokyo.ac.jp/pub/X/misc/ \
ftp://ftp.tk.mesh.ad.jp/pub/X/misc/ \
ftp://ftp.eos.hokudai.ac.jp/pub/X11/misc/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
USE_IMAKE= yes
MAN1= xgraph.1
diff --git a/math/xplot/Makefile b/math/xplot/Makefile
index 330e66d..5880a4d 100644
--- a/math/xplot/Makefile
+++ b/math/xplot/Makefile
@@ -10,7 +10,7 @@ DISTNAME= xplot-0.90
CATEGORIES= math graphics net
MASTER_SITES= ftp://mercury.lcs.mit.edu/pub/shep/
-MAINTAINER= fenner@FreeBSD.ORG
+MAINTAINER= fenner@FreeBSD.org
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/mbone/nte/Makefile b/mbone/nte/Makefile
index 06c9846..f40ceb8 100644
--- a/mbone/nte/Makefile
+++ b/mbone/nte/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: nte
# Version required: 1.5a23
# Date created: 5 September 1996
-# Whom: Bill Fenner <fenner@FreeBSD.ORG>
+# Whom: Bill Fenner <fenner@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/mbone/rtpmon/Makefile b/mbone/rtpmon/Makefile
index 7fd7f3e..8da5ea8 100644
--- a/mbone/rtpmon/Makefile
+++ b/mbone/rtpmon/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: rtpmon
# Version required: 1.0a7
# Date created: 1 November 1996
-# Whom: Bill Fenner <fenner@FreeBSD.ORG>
+# Whom: Bill Fenner <fenner@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/mbone/rtptools/Makefile b/mbone/rtptools/Makefile
index 0c1dc2f..e5c2214 100644
--- a/mbone/rtptools/Makefile
+++ b/mbone/rtptools/Makefile
@@ -10,7 +10,7 @@ DISTNAME= rtptools-1.9
CATEGORIES= mbone
MASTER_SITES= ftp://ftp.cs.columbia.edu/pub/schulzrinne/rtptools/
-MAINTAINER= fenner@FreeBSD.ORG
+MAINTAINER= fenner@FreeBSD.org
MAKE_ENV= ARCH=freebsd CC=cc
diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index 4924886..74f18ad 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: sdr
# Version required: 2.4a7
# Date created: 5 September 1996
-# Whom: Bill Fenner <fenner@FreeBSD.ORG>
+# Whom: Bill Fenner <fenner@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/mbone/speak_freely/Makefile b/mbone/speak_freely/Makefile
index 7ba6bf6..232c556 100644
--- a/mbone/speak_freely/Makefile
+++ b/mbone/speak_freely/Makefile
@@ -11,7 +11,7 @@ DISTNAME= speak_freely-6.1c
CATEGORIES= mbone audio security
MASTER_SITES= http://www.fourmilab.ch/speakfree/unix/prior-releases/6.1/
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
LIB_DEPENDS= gsm.1:${PORTSDIR}/audio/gsm
diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile
index 5315aa8..b86d3a9 100644
--- a/mbone/vat/Makefile
+++ b/mbone/vat/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= mbone tk80
MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vat/alpha-test/
DISTFILES= vatsrc-4.0b2.tar.gz
-MAINTAINER= fenner@FreeBSD.ORG
+MAINTAINER= fenner@FreeBSD.org
GSM_DIR= ${.CURDIR}/../../audio/gsm
GSM_WORK= ${WRKDIRPREFIX}${GSM_DIR}/work/gsm-1.0-pl10
diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile
index 9def1bd..db0ffff 100644
--- a/mbone/vic/Makefile
+++ b/mbone/vic/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= mbone tk80
MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vic/
DISTFILES= vicsrc-2.8.tar.gz
-MAINTAINER= fenner@FreeBSD.ORG
+MAINTAINER= fenner@FreeBSD.org
LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
diff --git a/mbone/wb/Makefile b/mbone/wb/Makefile
index e7ac4ff..7d0a13f 100644
--- a/mbone/wb/Makefile
+++ b/mbone/wb/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= mbone
MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/wb/
DISTFILES= i386-wb-1.59.tar.Z
-MAINTAINER= fenner@FreeBSD.ORG
+MAINTAINER= fenner@FreeBSD.org
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/misc/acron/Makefile b/misc/acron/Makefile
index 810dbeb..d4ae99c 100644
--- a/misc/acron/Makefile
+++ b/misc/acron/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: acron
# Version required: 1.2.4
# Date created: 13 Dec 1997
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= misc
MASTER_SITES= ftp://ftp.cs.uni-sb.de/pub/others/
EXTRACT_SUFX= .tgz
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
NO_BUILD= yes
diff --git a/misc/amanda-client/Makefile b/misc/amanda-client/Makefile
index b402453..6e13009 100644
--- a/misc/amanda-client/Makefile
+++ b/misc/amanda-client/Makefile
@@ -11,7 +11,7 @@ PKGNAME= amanda-2.4.1
CATEGORIES= misc
MASTER_SITES= ftp://ftp.amanda.org/pub/amanda/
-MAINTAINER= cwt@FreeBSD.ORG
+MAINTAINER= cwt@FreeBSD.org
BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index b402453..6e13009 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -11,7 +11,7 @@ PKGNAME= amanda-2.4.1
CATEGORIES= misc
MASTER_SITES= ftp://ftp.amanda.org/pub/amanda/
-MAINTAINER= cwt@FreeBSD.ORG
+MAINTAINER= cwt@FreeBSD.org
BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
diff --git a/misc/amanda/Makefile b/misc/amanda/Makefile
index 737decc..0b1deb7 100644
--- a/misc/amanda/Makefile
+++ b/misc/amanda/Makefile
@@ -10,7 +10,7 @@ DISTNAME= amanda-2.3.0
CATEGORIES= misc
MASTER_SITES= ftp://ftp.cs.umd.edu/pub/amanda/old-versions/
-MAINTAINER= gpalmer@FreeBSD.ORG
+MAINTAINER= gpalmer@FreeBSD.org
PATCH_STRIP=
MAN8= amanda.8 amadmin.8 amcheck.8 amcleanup.8 amdump.8 \
diff --git a/misc/amanda24-client/Makefile b/misc/amanda24-client/Makefile
index b402453..6e13009 100644
--- a/misc/amanda24-client/Makefile
+++ b/misc/amanda24-client/Makefile
@@ -11,7 +11,7 @@ PKGNAME= amanda-2.4.1
CATEGORIES= misc
MASTER_SITES= ftp://ftp.amanda.org/pub/amanda/
-MAINTAINER= cwt@FreeBSD.ORG
+MAINTAINER= cwt@FreeBSD.org
BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
diff --git a/misc/amanda24-server/Makefile b/misc/amanda24-server/Makefile
index b402453..6e13009 100644
--- a/misc/amanda24-server/Makefile
+++ b/misc/amanda24-server/Makefile
@@ -11,7 +11,7 @@ PKGNAME= amanda-2.4.1
CATEGORIES= misc
MASTER_SITES= ftp://ftp.amanda.org/pub/amanda/
-MAINTAINER= cwt@FreeBSD.ORG
+MAINTAINER= cwt@FreeBSD.org
BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
diff --git a/misc/amanda24/Makefile b/misc/amanda24/Makefile
index b402453..6e13009 100644
--- a/misc/amanda24/Makefile
+++ b/misc/amanda24/Makefile
@@ -11,7 +11,7 @@ PKGNAME= amanda-2.4.1
CATEGORIES= misc
MASTER_SITES= ftp://ftp.amanda.org/pub/amanda/
-MAINTAINER= cwt@FreeBSD.ORG
+MAINTAINER= cwt@FreeBSD.org
BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
diff --git a/misc/amanda25-client/Makefile b/misc/amanda25-client/Makefile
index b402453..6e13009 100644
--- a/misc/amanda25-client/Makefile
+++ b/misc/amanda25-client/Makefile
@@ -11,7 +11,7 @@ PKGNAME= amanda-2.4.1
CATEGORIES= misc
MASTER_SITES= ftp://ftp.amanda.org/pub/amanda/
-MAINTAINER= cwt@FreeBSD.ORG
+MAINTAINER= cwt@FreeBSD.org
BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile
index b402453..6e13009 100644
--- a/misc/amanda25-server/Makefile
+++ b/misc/amanda25-server/Makefile
@@ -11,7 +11,7 @@ PKGNAME= amanda-2.4.1
CATEGORIES= misc
MASTER_SITES= ftp://ftp.amanda.org/pub/amanda/
-MAINTAINER= cwt@FreeBSD.ORG
+MAINTAINER= cwt@FreeBSD.org
BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
diff --git a/misc/amanda26-client/Makefile b/misc/amanda26-client/Makefile
index b402453..6e13009 100644
--- a/misc/amanda26-client/Makefile
+++ b/misc/amanda26-client/Makefile
@@ -11,7 +11,7 @@ PKGNAME= amanda-2.4.1
CATEGORIES= misc
MASTER_SITES= ftp://ftp.amanda.org/pub/amanda/
-MAINTAINER= cwt@FreeBSD.ORG
+MAINTAINER= cwt@FreeBSD.org
BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile
index b402453..6e13009 100644
--- a/misc/amanda26-server/Makefile
+++ b/misc/amanda26-server/Makefile
@@ -11,7 +11,7 @@ PKGNAME= amanda-2.4.1
CATEGORIES= misc
MASTER_SITES= ftp://ftp.amanda.org/pub/amanda/
-MAINTAINER= cwt@FreeBSD.ORG
+MAINTAINER= cwt@FreeBSD.org
BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
diff --git a/misc/amanda32-client/Makefile b/misc/amanda32-client/Makefile
index b402453..6e13009 100644
--- a/misc/amanda32-client/Makefile
+++ b/misc/amanda32-client/Makefile
@@ -11,7 +11,7 @@ PKGNAME= amanda-2.4.1
CATEGORIES= misc
MASTER_SITES= ftp://ftp.amanda.org/pub/amanda/
-MAINTAINER= cwt@FreeBSD.ORG
+MAINTAINER= cwt@FreeBSD.org
BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index b402453..6e13009 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-server/Makefile
@@ -11,7 +11,7 @@ PKGNAME= amanda-2.4.1
CATEGORIES= misc
MASTER_SITES= ftp://ftp.amanda.org/pub/amanda/
-MAINTAINER= cwt@FreeBSD.ORG
+MAINTAINER= cwt@FreeBSD.org
BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index d2b812a..d9e95dc 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -20,7 +20,7 @@ EXTRACT_ONLY= ${DISTNAME}.shr
EPHEM= LRZ5_24 CHI_24 CPJV_24
DISTFILES= ${EXTRACT_ONLY} ${EPHEM}
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
USE_XLIB= yes
EXTRACT_CMD= ${SH}
diff --git a/misc/chord/Makefile b/misc/chord/Makefile
index dd6f9ed..b6fc36b 100644
--- a/misc/chord/Makefile
+++ b/misc/chord/Makefile
@@ -11,7 +11,7 @@ PKGNAME= chord-3.6
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_LOCAL}
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
MAN1= a2crd.1 chord.1
MANCOMPRESSED= yes
diff --git a/misc/dejagnu/Makefile b/misc/dejagnu/Makefile
index 3df7985..a4130ad 100644
--- a/misc/dejagnu/Makefile
+++ b/misc/dejagnu/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= misc tk80
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= dejagnu
-MAINTAINER= markm@FreeBSD.ORG
+MAINTAINER= markm@FreeBSD.org
RUN_DEPENDS= expect:${PORTSDIR}/lang/expect
diff --git a/misc/display/Makefile b/misc/display/Makefile
index 24570ef..a169147 100644
--- a/misc/display/Makefile
+++ b/misc/display/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX= .Z
PATCH_SITES= ${MASTER_SITES}
PATCHFILES= display.pch.Z
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
BUILD_DEPENDS= gunshar:${PORTSDIR}/archivers/gshar+gunshar
diff --git a/misc/git/Makefile b/misc/git/Makefile
index 9418ba4..203c78d 100644
--- a/misc/git/Makefile
+++ b/misc/git/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: git
# Version required: 4.3.17
# Date created: 12 Jul 1995
-# Whom: torstenb@FreeBSD.ORG
+# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= git
-MAINTAINER= jseger@FreeBSD.ORG
+MAINTAINER= jseger@FreeBSD.org
GNU_CONFIGURE= YES
MAN1= git.1 gitaction.1 gitkeys.1 gitmount.1 \
diff --git a/misc/gnuit/Makefile b/misc/gnuit/Makefile
index 9418ba4..203c78d 100644
--- a/misc/gnuit/Makefile
+++ b/misc/gnuit/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: git
# Version required: 4.3.17
# Date created: 12 Jul 1995
-# Whom: torstenb@FreeBSD.ORG
+# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= git
-MAINTAINER= jseger@FreeBSD.ORG
+MAINTAINER= jseger@FreeBSD.org
GNU_CONFIGURE= YES
MAN1= git.1 gitaction.1 gitkeys.1 gitmount.1 \
diff --git a/misc/less/Makefile b/misc/less/Makefile
index 0d8cbd4..7f1584a 100644
--- a/misc/less/Makefile
+++ b/misc/less/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= less
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
GNU_CONFIGURE= yes
MAN1= less.1 lesskey.1
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 5286a86..fc8337a 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: mc
# Version required: 4.5.31
# Date created: 15 Jul 1995
-# Whom: torstenb@FreeBSD.ORG
+# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
diff --git a/misc/p5-Array-PrintCols/Makefile b/misc/p5-Array-PrintCols/Makefile
index a695ec1..3afd415 100644
--- a/misc/p5-Array-PrintCols/Makefile
+++ b/misc/p5-Array-PrintCols/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= misc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Array
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/misc/p5-Business-CreditCard/Makefile b/misc/p5-Business-CreditCard/Makefile
index f73a24f..977c3b0 100644
--- a/misc/p5-Business-CreditCard/Makefile
+++ b/misc/p5-Business-CreditCard/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= misc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Business
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/misc/p5-Locale-Codes/Makefile b/misc/p5-Locale-Codes/Makefile
index eb6226f..0ff9bc1 100644
--- a/misc/p5-Locale-Codes/Makefile
+++ b/misc/p5-Locale-Codes/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: p5-Locale-Codes
# Version required: 1.00
# Date created: June 26th 1997
-# Whom: James FitzGibbon <jfitz@FreeBSD.ORG>
+# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= misc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Locale
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile
index 602ae5d..6e1fc24 100644
--- a/misc/pinfo/Makefile
+++ b/misc/pinfo/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: pinfo
# Version required: 0.5.5
# Date created: 19 May 1999
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= pinfo-0.5.5
CATEGORIES= misc
MASTER_SITES= http://zeus.polsl.gliwice.pl/~pborys/stable-version/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= intl\.1:${PORTSDIR}/devel/gettext \
ncurses\.4:${PORTSDIR}/devel/ncurses
diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile
index fde9de6..0b47268 100644
--- a/misc/rpm/Makefile
+++ b/misc/rpm/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: rpm
# Version required: 2.5.5
# Date created: 30 April 1999
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= rpm-2.5.5
CATEGORIES= misc
MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-2.5.x/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index 9379043..b114232 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \
${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= screen
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
GNU_CONFIGURE= yes
MAN1= screen.1
diff --git a/misc/sma/Makefile b/misc/sma/Makefile
index bc4d839..0becfe4 100644
--- a/misc/sma/Makefile
+++ b/misc/sma/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: sma
# Version required: 0.9.13
# Date created: 8 May 1998
-# Whom: Donald Burr <dburr@FreeBSD.ORG>
+# Whom: Donald Burr <dburr@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= misc
MASTER_SITES= http://www.scour.net/sma/
EXTRACT_SUFX= .pl
-MAINTAINER= dburr@FreeBSD.ORG
+MAINTAINER= dburr@FreeBSD.org
RUN_DEPENDS= smbclient:${PORTSDIR}/net/samba
diff --git a/misc/tkinfo/Makefile b/misc/tkinfo/Makefile
index 22b26be..b6a561d 100644
--- a/misc/tkinfo/Makefile
+++ b/misc/tkinfo/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: tkinfo
# Version required: 2.4
# Date created: 16 Jan 1995
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= tkinfo-2.4
CATEGORIES= misc tk80
MASTER_SITES= http://math-www.uni-paderborn.de/~axel/tkinfo/
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
RUN_DEPENDS= wish8.0:${PORTSDIR}/x11-toolkits/tk80
diff --git a/misc/wmweather/Makefile b/misc/wmweather/Makefile
index e19a565..4c2721b 100644
--- a/misc/wmweather/Makefile
+++ b/misc/wmweather/Makefile
@@ -9,7 +9,7 @@ DISTNAME= wmWeather-1.31
CATEGORIES= misc windowmaker
MASTER_SITES= http://nis-www.lanl.gov/~mgh/WindowMaker/
-MAINTAINER= kris@FreeBSD.ORG
+MAINTAINER= kris@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/misc/xdelta/Makefile b/misc/xdelta/Makefile
index bb00d09..34ddc29 100644
--- a/misc/xdelta/Makefile
+++ b/misc/xdelta/Makefile
@@ -10,7 +10,7 @@ DISTNAME= xdelta-1.0.2
CATEGORIES= misc
MASTER_SITES= ftp://ftp.xcf.berkeley.edu/pub/xdelta/
-MAINTAINER= jmacd@FreeBSD.ORG
+MAINTAINER= jmacd@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
LIB_DEPENDS= glib12.2:${PORTSDIR}/devel/glib12
diff --git a/multimedia/linux-realplayer/Makefile b/multimedia/linux-realplayer/Makefile
index 1499348..78f5006 100644
--- a/multimedia/linux-realplayer/Makefile
+++ b/multimedia/linux-realplayer/Makefile
@@ -11,7 +11,7 @@ PKGNAME= linux-realplayer-5.0
CATEGORIES= audio
MASTER_SITES=
-MAINTAINER= kris@FreeBSD.ORG
+MAINTAINER= kris@FreeBSD.org
RUN_DEPENDS= /compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
diff --git a/multimedia/mpeg_play/Makefile b/multimedia/mpeg_play/Makefile
index cb81365..63f37bd 100644
--- a/multimedia/mpeg_play/Makefile
+++ b/multimedia/mpeg_play/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= graphics
MASTER_SITES= ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/play/
EXTRACT_SUFX= -patched-src.tar.gz
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
WRKSRC= ${WRKDIR}/mpeg_play
USE_IMAKE= yes
diff --git a/multimedia/netshow/Makefile b/multimedia/netshow/Makefile
index 8a34f46..5244ac0 100644
--- a/multimedia/netshow/Makefile
+++ b/multimedia/netshow/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: netshow
# Version required: 2.00.251
# Date created: Thu Jun 11 22:38:52 PDT 1998
-# Whom: dburr@FreeBSD.ORG
+# Whom: dburr@FreeBSD.org
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= graphics net
MASTER_SITES= http://microsoft.com/netshow/download/en/beta/
EXTRACT_SUFX= .gz
-MAINTAINER= dburr@FreeBSD.ORG
+MAINTAINER= dburr@FreeBSD.org
RUN_DEPENDS= /compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
diff --git a/multimedia/vic/Makefile b/multimedia/vic/Makefile
index 9def1bd..db0ffff 100644
--- a/multimedia/vic/Makefile
+++ b/multimedia/vic/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= mbone tk80
MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vic/
DISTFILES= vicsrc-2.8.tar.gz
-MAINTAINER= fenner@FreeBSD.ORG
+MAINTAINER= fenner@FreeBSD.org
LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile
index 3df1c48..cc5b539 100644
--- a/multimedia/xanim/Makefile
+++ b/multimedia/xanim/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://xanim.va.pubnix.com/ \
ftp://xanim.va.pubnix.com/dlls/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${EXTRA_FILES}
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
EXTRA_FILES= vid_cvid_2.1_freebsdELFx86.tgz \
vid_cyuv_1.0_freebsdELFx86.tgz \
diff --git a/net-im/gicq/Makefile b/net-im/gicq/Makefile
index ac51394..7cfa46e 100644
--- a/net-im/gicq/Makefile
+++ b/net-im/gicq/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= net
MASTER_SITES= ftp://ftp.korsoft.com/pub/gicq/ \
http://www.nectar.com/distfiles/
-MAINTAINER= flathill@FreeBSD.ORG
+MAINTAINER= flathill@FreeBSD.org
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
icq.0:${PORTSDIR}/net/libicq
diff --git a/net-im/gnomeicu/Makefile b/net-im/gnomeicu/Makefile
index f99af81..bc31c4e 100644
--- a/net-im/gnomeicu/Makefile
+++ b/net-im/gnomeicu/Makefile
@@ -1,7 +1,7 @@
# Ports collection Makefile for: GnomeICU
# Version required: 0.62a
# Date created: 03/16/1999
-# Whom: nectar@FreeBSD.ORG
+# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= net gnome
MASTER_SITES= ftp://gnomeicu.gdev.net/pub/gnomeicu/ \
http://www.nectar.cc/distfiles/
-MAINTAINER= nectar@FreeBSD.ORG
+MAINTAINER= nectar@FreeBSD.org
LIB_DEPENDS= panel_applet.1:${PORTSDIR}/x11/gnomecore
diff --git a/net-im/gnomeicu2/Makefile b/net-im/gnomeicu2/Makefile
index f99af81..bc31c4e 100644
--- a/net-im/gnomeicu2/Makefile
+++ b/net-im/gnomeicu2/Makefile
@@ -1,7 +1,7 @@
# Ports collection Makefile for: GnomeICU
# Version required: 0.62a
# Date created: 03/16/1999
-# Whom: nectar@FreeBSD.ORG
+# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= net gnome
MASTER_SITES= ftp://gnomeicu.gdev.net/pub/gnomeicu/ \
http://www.nectar.cc/distfiles/
-MAINTAINER= nectar@FreeBSD.ORG
+MAINTAINER= nectar@FreeBSD.org
LIB_DEPENDS= panel_applet.1:${PORTSDIR}/x11/gnomecore
diff --git a/net-im/libicq/Makefile b/net-im/libicq/Makefile
index 16ef6cc..3653244 100644
--- a/net-im/libicq/Makefile
+++ b/net-im/libicq/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= net
MASTER_SITES= ftp://ftp.korsoft.com/pub/gicq/ \
http://www.nectar.com/distfiles/
-MAINTAINER= flathill@FreeBSD.ORG
+MAINTAINER= flathill@FreeBSD.org
LIB_DEPENDS= glib12.2:${PORTSDIR}/devel/glib12
diff --git a/net-mgmt/irrtoolset/Makefile b/net-mgmt/irrtoolset/Makefile
index f1f8d7f..b45f9d6 100644
--- a/net-mgmt/irrtoolset/Makefile
+++ b/net-mgmt/irrtoolset/Makefile
@@ -11,7 +11,7 @@ PKGNAME= ratoolset-3.5.2
CATEGORIES= net tk41
MASTER_SITES= ftp://ftp.isi.edu/ra/RAToolSet/
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
LIB_DEPENDS= tk41.1:${PORTSDIR}/x11-toolkits/tk41
diff --git a/net-mgmt/mrtg/Makefile b/net-mgmt/mrtg/Makefile
index 3133842..2e638a3 100644
--- a/net-mgmt/mrtg/Makefile
+++ b/net-mgmt/mrtg/Makefile
@@ -10,7 +10,7 @@ DISTNAME= mrtg-2.8.6
CATEGORIES= net
MASTER_SITES= http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/pub/
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd
diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile
index a6b0b05..cdc68e0 100644
--- a/net-mgmt/net-snmp-devel/Makefile
+++ b/net-mgmt/net-snmp-devel/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ucd-snmp.ucdavis.edu/ \
ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
ftp://ftp.win.or.jp/pub/network/snmp/ucd-snmp/
-MAINTAINER= gpalmer@FreeBSD.ORG
+MAINTAINER= gpalmer@FreeBSD.org
CONFIGURE_ARGS= --enable-shared
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index a6b0b05..cdc68e0 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ucd-snmp.ucdavis.edu/ \
ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
ftp://ftp.win.or.jp/pub/network/snmp/ucd-snmp/
-MAINTAINER= gpalmer@FreeBSD.ORG
+MAINTAINER= gpalmer@FreeBSD.org
CONFIGURE_ARGS= --enable-shared
diff --git a/net-mgmt/net-snmp4/Makefile b/net-mgmt/net-snmp4/Makefile
index a6b0b05..cdc68e0 100644
--- a/net-mgmt/net-snmp4/Makefile
+++ b/net-mgmt/net-snmp4/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ucd-snmp.ucdavis.edu/ \
ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
ftp://ftp.win.or.jp/pub/network/snmp/ucd-snmp/
-MAINTAINER= gpalmer@FreeBSD.ORG
+MAINTAINER= gpalmer@FreeBSD.org
CONFIGURE_ARGS= --enable-shared
diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile
index a6b0b05..cdc68e0 100644
--- a/net-mgmt/net-snmp53/Makefile
+++ b/net-mgmt/net-snmp53/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ucd-snmp.ucdavis.edu/ \
ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
ftp://ftp.win.or.jp/pub/network/snmp/ucd-snmp/
-MAINTAINER= gpalmer@FreeBSD.ORG
+MAINTAINER= gpalmer@FreeBSD.org
CONFIGURE_ARGS= --enable-shared
diff --git a/net-mgmt/p5-SNMP/Makefile b/net-mgmt/p5-SNMP/Makefile
index c776417..8be393e 100644
--- a/net-mgmt/p5-SNMP/Makefile
+++ b/net-mgmt/p5-SNMP/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= SNMP
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
LIB_DEPENDS= snmp.3:${PORTSDIR}/net/ucd-snmp
diff --git a/net-mgmt/p5-SNMP_Session/Makefile b/net-mgmt/p5-SNMP_Session/Makefile
index f17fb66..ddce22f 100644
--- a/net-mgmt/p5-SNMP_Session/Makefile
+++ b/net-mgmt/p5-SNMP_Session/Makefile
@@ -11,7 +11,7 @@ PKGNAME= p5-SNMP_Session-0.72
CATEGORIES= net perl5
MASTER_SITES= ftp://ftp.switch.ch/software/sources/network/snmp/perl/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
USE_PERL5= yes
diff --git a/net/SSLtelnet/Makefile b/net/SSLtelnet/Makefile
index e6ee9c3..62940da 100644
--- a/net/SSLtelnet/Makefile
+++ b/net/SSLtelnet/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: SSLtelnet
# Version required: 0.13
# Date created: Mar 29, 1998
-# Whom: issei@jp.FreeBSD.ORG
+# Whom: issei@jp.FreeBSD.org
#
# $FreeBSD$
@@ -9,7 +9,7 @@ DISTNAME= SSLtelnet-0.13
CATEGORIES= net security
MASTER_SITES= ftp://ftp.psy.uq.oz.au/pub/Crypto/SSLapps/
-MAINTAINER= issei@jp.FreeBSD.ORG
+MAINTAINER= issei@jp.FreeBSD.org
.if defined(USA_RESIDENT) && ${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO
pre-fetch:
diff --git a/net/archie/Makefile b/net/archie/Makefile
index be5b527..fe8df2f 100644
--- a/net/archie/Makefile
+++ b/net/archie/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= net
MASTER_SITES= ftp://ftp.uu.net/networking/info-service/archie/clients/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
WRKSRC= ${WRKDIR}/archie-1.4.1-FIX
MAN1= archie.1
diff --git a/net/arla/Makefile b/net/arla/Makefile
index aff62f8..0adbb23 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: arla
# Version required: 2.7.1ac-0.84
# Date created: 09 Sep 1998
-# Whom: Peter Hawkins <thepish@FreeBSD.ORG>
+# Whom: Peter Hawkins <thepish@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/net/ascend-radius/Makefile b/net/ascend-radius/Makefile
index 985eb22..1f8c135 100644
--- a/net/ascend-radius/Makefile
+++ b/net/ascend-radius/Makefile
@@ -20,7 +20,7 @@ DISTFILES= radius-980618.tar.gz \
980618.pdf
EXTRACT_ONLY= radius-980618.tar.gz
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
WRKPREFIX= radius-980618/radius-1.16-ascend
WRKSRC= ${WRKDIR}/${WRKPREFIX}/ascendd
diff --git a/net/bb/Makefile b/net/bb/Makefile
index 1b349f2..9d23bde 100644
--- a/net/bb/Makefile
+++ b/net/bb/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= net
MASTER_SITES= http://maclawran.ca/~sean/bb-dnld/ \
http://freefall.freebsd.org/~andreas/download/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
# The FreeBSD Ports Team has permission to include this in our CDROM
# from the author, but others who wish to do likewise will have to
diff --git a/net/cap/Makefile b/net/cap/Makefile
index 70eb5ed..e451fa6 100644
--- a/net/cap/Makefile
+++ b/net/cap/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: cap
# Version required: 6.0PL198
# Date created: 09 Nov 1996
-# Whom: Masafumi NAKANE <max@FreeBSD.ORG>
+# Whom: Masafumi NAKANE <max@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index a3c44ac..aa7affd 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= comms
MASTER_SITES=
EXTRACT_SUFX= .tar.Z
-MAINTAINER= msmith@FreeBSD.ORG
+MAINTAINER= msmith@FreeBSD.org
RUN_DEPENDS= /compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
diff --git a/net/citrix_xenapp/Makefile b/net/citrix_xenapp/Makefile
index a3c44ac..aa7affd 100644
--- a/net/citrix_xenapp/Makefile
+++ b/net/citrix_xenapp/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= comms
MASTER_SITES=
EXTRACT_SUFX= .tar.Z
-MAINTAINER= msmith@FreeBSD.ORG
+MAINTAINER= msmith@FreeBSD.org
RUN_DEPENDS= /compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
diff --git a/net/delegate/Makefile b/net/delegate/Makefile
index 508f852..0ff5394 100644
--- a/net/delegate/Makefile
+++ b/net/delegate/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: DeleGate
# Version required: 5.9.3
# Date created: 26 Jan 1997
-# Whom: Masafumi NAKANE <max@FreeBSD.ORG>
+# Whom: Masafumi NAKANE <max@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= delegate-5.9.3
CATEGORIES= net www japanese
MASTER_SITES= ftp://etlport.etl.go.jp/pub/DeleGate/
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
MAKE_ENV= PATH=$${PATH}:.
diff --git a/net/echoping/Makefile b/net/echoping/Makefile
index 364ebe2..63af4e3 100644
--- a/net/echoping/Makefile
+++ b/net/echoping/Makefile
@@ -10,7 +10,7 @@ DISTNAME= echoping-2.2.0
CATEGORIES= net
MASTER_SITES= ftp://ftp.internatif.org/pub/unix/echoping/
-MAINTAINER= peter@FreeBSD.ORG
+MAINTAINER= peter@FreeBSD.org
MAN1= echoping.1
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index a84ce23..1a06cf1 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://alpha1.linuxberg.com/files/x11/network/ \
http://ethereal.zing.org/distribution/ \
http://ethereal.boehm.org/distribution/
-MAINTAINER= billf@FreeBSD.ORG
+MAINTAINER= billf@FreeBSD.org
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
diff --git a/net/fspclient/Makefile b/net/fspclient/Makefile
index 135362e..bba8cac 100644
--- a/net/fspclient/Makefile
+++ b/net/fspclient/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= net
MASTER_SITES= ftp://ftp.germany.eu.net/pub/networking/fsp/
EXTRACT_SUFX= .tar.z
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
WRKSRC= ${WRKDIR}/fspclient
GNU_CONFIGURE= yes
diff --git a/net/gated/Makefile b/net/gated/Makefile
index 8b5ea85..cb479f3 100644
--- a/net/gated/Makefile
+++ b/net/gated/Makefile
@@ -11,7 +11,7 @@ PKGNAME= gated-3.5.11
CATEGORIES= net
MASTER_SITES= ftp://ftp.gated.merit.edu/net-research/gated/
-MAINTAINER= peter@FreeBSD.ORG
+MAINTAINER= peter@FreeBSD.org
ALL_TARGET= gated
MAN8= gated.8 ripquery.8 ospf_monitor.8 gdc.8
diff --git a/net/gicq/Makefile b/net/gicq/Makefile
index ac51394..7cfa46e 100644
--- a/net/gicq/Makefile
+++ b/net/gicq/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= net
MASTER_SITES= ftp://ftp.korsoft.com/pub/gicq/ \
http://www.nectar.com/distfiles/
-MAINTAINER= flathill@FreeBSD.ORG
+MAINTAINER= flathill@FreeBSD.org
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
icq.0:${PORTSDIR}/net/libicq
diff --git a/net/gnomeicu/Makefile b/net/gnomeicu/Makefile
index f99af81..bc31c4e 100644
--- a/net/gnomeicu/Makefile
+++ b/net/gnomeicu/Makefile
@@ -1,7 +1,7 @@
# Ports collection Makefile for: GnomeICU
# Version required: 0.62a
# Date created: 03/16/1999
-# Whom: nectar@FreeBSD.ORG
+# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= net gnome
MASTER_SITES= ftp://gnomeicu.gdev.net/pub/gnomeicu/ \
http://www.nectar.cc/distfiles/
-MAINTAINER= nectar@FreeBSD.ORG
+MAINTAINER= nectar@FreeBSD.org
LIB_DEPENDS= panel_applet.1:${PORTSDIR}/x11/gnomecore
diff --git a/net/gnomeicu/gnomeicu/Makefile b/net/gnomeicu/gnomeicu/Makefile
index f99af81..bc31c4e 100644
--- a/net/gnomeicu/gnomeicu/Makefile
+++ b/net/gnomeicu/gnomeicu/Makefile
@@ -1,7 +1,7 @@
# Ports collection Makefile for: GnomeICU
# Version required: 0.62a
# Date created: 03/16/1999
-# Whom: nectar@FreeBSD.ORG
+# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= net gnome
MASTER_SITES= ftp://gnomeicu.gdev.net/pub/gnomeicu/ \
http://www.nectar.cc/distfiles/
-MAINTAINER= nectar@FreeBSD.ORG
+MAINTAINER= nectar@FreeBSD.org
LIB_DEPENDS= panel_applet.1:${PORTSDIR}/x11/gnomecore
diff --git a/net/gnomeicu2/Makefile b/net/gnomeicu2/Makefile
index f99af81..bc31c4e 100644
--- a/net/gnomeicu2/Makefile
+++ b/net/gnomeicu2/Makefile
@@ -1,7 +1,7 @@
# Ports collection Makefile for: GnomeICU
# Version required: 0.62a
# Date created: 03/16/1999
-# Whom: nectar@FreeBSD.ORG
+# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= net gnome
MASTER_SITES= ftp://gnomeicu.gdev.net/pub/gnomeicu/ \
http://www.nectar.cc/distfiles/
-MAINTAINER= nectar@FreeBSD.ORG
+MAINTAINER= nectar@FreeBSD.org
LIB_DEPENDS= panel_applet.1:${PORTSDIR}/x11/gnomecore
diff --git a/net/h2n/Makefile b/net/h2n/Makefile
index 9d5e702..2e5e4f4 100644
--- a/net/h2n/Makefile
+++ b/net/h2n/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: h2n
# Version required: 1.29
# Date created: 27 Nov 1997
-# Whom: SADA Kenji <sada@FreeBSD.ORG>
+# Whom: SADA Kenji <sada@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.iij.ad.jp/pub/published/oreilly/nutshell/dnsbind/ \
ftp://ftp.uu.net/published/oreilly/nutshell/dnsbind/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= sada@FreeBSD.ORG
+MAINTAINER= sada@FreeBSD.org
NO_BUILD= YES
NO_WRKSUBDIR= YES
diff --git a/net/hesiod/Makefile b/net/hesiod/Makefile
index 20ae3ff..1744782 100644
--- a/net/hesiod/Makefile
+++ b/net/hesiod/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= net
MASTER_SITES= ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/ \
http://www.nectar.cc/distfiles/
-MAINTAINER= nectar@FreeBSD.ORG
+MAINTAINER= nectar@FreeBSD.org
MAN1= hesinfo.1
MAN3= hesiod.3 hesiod_end.3 hesiod_free_list.3 \
diff --git a/net/irrtoolset/Makefile b/net/irrtoolset/Makefile
index f1f8d7f..b45f9d6 100644
--- a/net/irrtoolset/Makefile
+++ b/net/irrtoolset/Makefile
@@ -11,7 +11,7 @@ PKGNAME= ratoolset-3.5.2
CATEGORIES= net tk41
MASTER_SITES= ftp://ftp.isi.edu/ra/RAToolSet/
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
LIB_DEPENDS= tk41.1:${PORTSDIR}/x11-toolkits/tk41
diff --git a/net/ldapsdk/Makefile b/net/ldapsdk/Makefile
index 7bd8795..8656c2d 100644
--- a/net/ldapsdk/Makefile
+++ b/net/ldapsdk/Makefile
@@ -11,7 +11,7 @@ PKGNAME= ldapsdk-1998.12.31
CATEGORIES= net
MASTER_SITES= ftp://ftp.mozilla.org/pub/directory/c-sdk/ldap/
-MAINTAINER= paul@FreeBSD.ORG
+MAINTAINER= paul@FreeBSD.org
WRKSRC= ${WRKDIR}/mozilla
MAKEFILE= ${WRKSRC}/directory/ldapsdk.mk
diff --git a/net/libicq/Makefile b/net/libicq/Makefile
index 16ef6cc..3653244 100644
--- a/net/libicq/Makefile
+++ b/net/libicq/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= net
MASTER_SITES= ftp://ftp.korsoft.com/pub/gicq/ \
http://www.nectar.com/distfiles/
-MAINTAINER= flathill@FreeBSD.ORG
+MAINTAINER= flathill@FreeBSD.org
LIB_DEPENDS= glib12.2:${PORTSDIR}/devel/glib12
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index 3133842..2e638a3 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -10,7 +10,7 @@ DISTNAME= mrtg-2.8.6
CATEGORIES= net
MASTER_SITES= http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/pub/
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd
diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index a6b0b05..cdc68e0 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ucd-snmp.ucdavis.edu/ \
ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
ftp://ftp.win.or.jp/pub/network/snmp/ucd-snmp/
-MAINTAINER= gpalmer@FreeBSD.ORG
+MAINTAINER= gpalmer@FreeBSD.org
CONFIGURE_ARGS= --enable-shared
diff --git a/net/net-snmp4/Makefile b/net/net-snmp4/Makefile
index a6b0b05..cdc68e0 100644
--- a/net/net-snmp4/Makefile
+++ b/net/net-snmp4/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ucd-snmp.ucdavis.edu/ \
ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
ftp://ftp.win.or.jp/pub/network/snmp/ucd-snmp/
-MAINTAINER= gpalmer@FreeBSD.ORG
+MAINTAINER= gpalmer@FreeBSD.org
CONFIGURE_ARGS= --enable-shared
diff --git a/net/ntp-devel/Makefile b/net/ntp-devel/Makefile
index 2c70c37..2366a28 100644
--- a/net/ntp-devel/Makefile
+++ b/net/ntp-devel/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ntp-4.0.93a
CATEGORIES= net
MASTER_SITES= ftp://ftp.udel.edu/pub/ntp/testing/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
# ntp's configure script created by autoconf 2.14.1 doesn't work
# our autoconf version 2.13 produces better results
diff --git a/net/ntp-stable/Makefile b/net/ntp-stable/Makefile
index 2c70c37..2366a28 100644
--- a/net/ntp-stable/Makefile
+++ b/net/ntp-stable/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ntp-4.0.93a
CATEGORIES= net
MASTER_SITES= ftp://ftp.udel.edu/pub/ntp/testing/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
# ntp's configure script created by autoconf 2.14.1 doesn't work
# our autoconf version 2.13 produces better results
diff --git a/net/ntp/Makefile b/net/ntp/Makefile
index 2c70c37..2366a28 100644
--- a/net/ntp/Makefile
+++ b/net/ntp/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ntp-4.0.93a
CATEGORIES= net
MASTER_SITES= ftp://ftp.udel.edu/pub/ntp/testing/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
# ntp's configure script created by autoconf 2.14.1 doesn't work
# our autoconf version 2.13 produces better results
diff --git a/net/p5-Archie/Makefile b/net/p5-Archie/Makefile
index faef0aa..4649772 100644
--- a/net/p5-Archie/Makefile
+++ b/net/p5-Archie/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Archie
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/net/p5-Net-DNS/Makefile b/net/p5-Net-DNS/Makefile
index f01c018..db02e38 100644
--- a/net/p5-Net-DNS/Makefile
+++ b/net/p5-Net-DNS/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Net
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/net/p5-Net-Whois/Makefile b/net/p5-Net-Whois/Makefile
index f1e852f..c38db64 100644
--- a/net/p5-Net-Whois/Makefile
+++ b/net/p5-Net-Whois/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Net
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
RUN_DEPENDS= ${PREFIX}/lib/perl5/site_perl/Locale/Country.pm:${PORTSDIR}/misc/p5-Locale-Codes
diff --git a/net/p5-Net/Makefile b/net/p5-Net/Makefile
index 2dd5fec..1316ca4 100644
--- a/net/p5-Net/Makefile
+++ b/net/p5-Net/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Net
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/net/p5-SNMP/Makefile b/net/p5-SNMP/Makefile
index c776417..8be393e 100644
--- a/net/p5-SNMP/Makefile
+++ b/net/p5-SNMP/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= SNMP
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
LIB_DEPENDS= snmp.3:${PORTSDIR}/net/ucd-snmp
diff --git a/net/p5-SNMP_Session/Makefile b/net/p5-SNMP_Session/Makefile
index f17fb66..ddce22f 100644
--- a/net/p5-SNMP_Session/Makefile
+++ b/net/p5-SNMP_Session/Makefile
@@ -11,7 +11,7 @@ PKGNAME= p5-SNMP_Session-0.72
CATEGORIES= net perl5
MASTER_SITES= ftp://ftp.switch.ch/software/sources/network/snmp/perl/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
USE_PERL5= yes
diff --git a/net/p5-URI/Makefile b/net/p5-URI/Makefile
index 0db07b5..deb759c 100644
--- a/net/p5-URI/Makefile
+++ b/net/p5-URI/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= URI
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
USE_PERL5= YES
MAN3= \
diff --git a/net/p5-pRPC/Makefile b/net/p5-pRPC/Makefile
index 4720e1c..188feca 100644
--- a/net/p5-pRPC/Makefile
+++ b/net/p5-pRPC/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: p5-pRPC
# Version required: 0.1005
# Date Created: Aug 18 1998
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= RPC
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/i386-freebsd/Storable.pm:${PORTSDIR}/devel/p5-Storable
diff --git a/net/perldap/Makefile b/net/perldap/Makefile
index de0ffdd..0c1c289 100644
--- a/net/perldap/Makefile
+++ b/net/perldap/Makefile
@@ -11,7 +11,7 @@ DISTFILES= perldap-1.2.2.tgz
CATEGORIES= net
MASTER_SITES= ftp://ftp.mozilla.org/pub/directory/perldap/
-MAINTAINER= paul@FreeBSD.ORG
+MAINTAINER= paul@FreeBSD.org
WRKSRC= ${WRKDIR}/perldap
LIB_DEPENDS= ldap.1:${PORTSDIR}/net/ldapsdk
diff --git a/net/ppp-nt/Makefile b/net/ppp-nt/Makefile
index cc89e14..e03f79c 100644
--- a/net/ppp-nt/Makefile
+++ b/net/ppp-nt/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: ppp + nat + time schedule
# Version required: 2.2.7
# Date created: 10 August 1998
-# Whom: SADA Kenji <sada@FreeBSD.ORG>
+# Whom: SADA Kenji <sada@FreeBSD.org>
#
# $FreeBSD$
#
@@ -17,7 +17,7 @@ PATCH_SITES= http://www.rr.iij4u.or.jp/~sada/patches/ \
PATCHFILES= nat-980920.patch.gz ppp-2.2.7-telehoudai.diff.gz
PATCH_DIST_STRIP= -p1
-MAINTAINER= sada@FreeBSD.ORG
+MAINTAINER= sada@FreeBSD.org
MANCOMPRESSED= yes
MAN8= ppp.8
diff --git a/net/pppload/Makefile b/net/pppload/Makefile
index ddd000a..89d2757 100644
--- a/net/pppload/Makefile
+++ b/net/pppload/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= net sysutils
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= system/network/serial/ppp
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
USE_QT= yes
USE_GMAKE= yes
diff --git a/net/radius/Makefile b/net/radius/Makefile
index f8a0f33..9400ee1 100644
--- a/net/radius/Makefile
+++ b/net/radius/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: radius
# Version required: merit radius 2.4.23
# Date created: 4. July 1996
-# Whom: torstenb@FreeBSD.ORG
+# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
diff --git a/net/ratoolset/Makefile b/net/ratoolset/Makefile
index f1f8d7f..b45f9d6 100644
--- a/net/ratoolset/Makefile
+++ b/net/ratoolset/Makefile
@@ -11,7 +11,7 @@ PKGNAME= ratoolset-3.5.2
CATEGORIES= net tk41
MASTER_SITES= ftp://ftp.isi.edu/ra/RAToolSet/
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
LIB_DEPENDS= tk41.1:${PORTSDIR}/x11-toolkits/tk41
diff --git a/net/rmsg/Makefile b/net/rmsg/Makefile
index ea5607c..69954e1 100644
--- a/net/rmsg/Makefile
+++ b/net/rmsg/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: rmsg
# Version required: 1.64
# Date created: 9 October 1995
-# Whom: torstenb@FreeBSD.ORG
+# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
diff --git a/net/rshell/Makefile b/net/rshell/Makefile
index a0f9c66..87684ef 100644
--- a/net/rshell/Makefile
+++ b/net/rshell/Makefile
@@ -10,7 +10,7 @@ DISTNAME= rshell-1.0
CATEGORIES= net
MASTER_SITES= http://www.freebsd.org/~wosch/src/
-MAINTAINER= wosch@FreeBSD.ORG
+MAINTAINER= wosch@FreeBSD.org
MAN1= rshell.1
MLINKS= rshell.1 rcopy.1
diff --git a/net/rtptools/Makefile b/net/rtptools/Makefile
index 0c1dc2f..e5c2214 100644
--- a/net/rtptools/Makefile
+++ b/net/rtptools/Makefile
@@ -10,7 +10,7 @@ DISTNAME= rtptools-1.9
CATEGORIES= mbone
MASTER_SITES= ftp://ftp.cs.columbia.edu/pub/schulzrinne/rtptools/
-MAINTAINER= fenner@FreeBSD.ORG
+MAINTAINER= fenner@FreeBSD.org
MAKE_ENV= ARCH=freebsd CC=cc
diff --git a/net/rwhois/Makefile b/net/rwhois/Makefile
index 3308dcc..b4f5d7b 100644
--- a/net/rwhois/Makefile
+++ b/net/rwhois/Makefile
@@ -11,7 +11,7 @@ PKGNAME= rwhois-1.0b9.2
CATEGORIES= net
MASTER_SITES= ftp://ftp.rwhois.net/pub/
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
.if !exists(/usr/include/tcpd.h)
LIB_DEPENDS= wrap.7:${PORTSDIR}/security/tcp_wrapper
diff --git a/net/rwhoisd/Makefile b/net/rwhoisd/Makefile
index 3308dcc..b4f5d7b 100644
--- a/net/rwhoisd/Makefile
+++ b/net/rwhoisd/Makefile
@@ -11,7 +11,7 @@ PKGNAME= rwhois-1.0b9.2
CATEGORIES= net
MASTER_SITES= ftp://ftp.rwhois.net/pub/
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
.if !exists(/usr/include/tcpd.h)
LIB_DEPENDS= wrap.7:${PORTSDIR}/security/tcp_wrapper
diff --git a/net/sdr/Makefile b/net/sdr/Makefile
index 4924886..74f18ad 100644
--- a/net/sdr/Makefile
+++ b/net/sdr/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: sdr
# Version required: 2.4a7
# Date created: 5 September 1996
-# Whom: Bill Fenner <fenner@FreeBSD.ORG>
+# Whom: Bill Fenner <fenner@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/net/sharity-light/Makefile b/net/sharity-light/Makefile
index 8c3b216..3e75238 100644
--- a/net/sharity-light/Makefile
+++ b/net/sharity-light/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.obdev.at/pub/Products/Sharity-Light/ \
ftp://ftp.warpnet.ro/mirrors/ftp.obdev.at/pub/Products/Sharity-Light/ \
http://www.freebsd.org/~dt/distfiles/
-MAINTAINER= dt@FreeBSD.ORG
+MAINTAINER= dt@FreeBSD.org
MAN8= smbmount.8
diff --git a/net/sniffit/Makefile b/net/sniffit/Makefile
index 10089fc..83299b8 100644
--- a/net/sniffit/Makefile
+++ b/net/sniffit/Makefile
@@ -13,7 +13,7 @@ CATEGORIES= net security
MASTER_SITES= http://reptile.rug.ac.be/~coder/sniffit/files/ \
http://www.freebsd.org/~obrien/Distfiles/
-MAINTAINER= obrien@FreeBSD.ORG
+MAINTAINER= obrien@FreeBSD.org
GNU_CONFIGURE= yes
ALL_TARGET=
diff --git a/net/tcptrace/Makefile b/net/tcptrace/Makefile
index d0b6939..c312f90 100644
--- a/net/tcptrace/Makefile
+++ b/net/tcptrace/Makefile
@@ -11,7 +11,7 @@ PKGNAME= tcptrace-5.1.0
CATEGORIES= net
MASTER_SITES= http://jarok.cs.ohiou.edu/software/tcptrace/files/5.1.0/
-MAINTAINER= fenner@FreeBSD.ORG
+MAINTAINER= fenner@FreeBSD.org
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/tcptrace_5.1.0
diff --git a/net/telnetx/Makefile b/net/telnetx/Makefile
index c01428f..30eda9a 100644
--- a/net/telnetx/Makefile
+++ b/net/telnetx/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: telnetx
# Version required: ?
# Date created: 22 Sep 1996
-# Whom: Masafumi NAKANE <max@FreeBSD.ORG>
+# Whom: Masafumi NAKANE <max@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_LOCAL} \
http://www.sfc.wide.ad.jp/~max/FreeBSD/ports/distfiles/
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
RUN_DEPENDS= rz:${PORTSDIR}/comms/rzsz
RUN_DEPENDS+= bp:${PORTSDIR}/comms/bpl+
diff --git a/net/tintin++-devel/Makefile b/net/tintin++-devel/Makefile
index 75b5e39..ab98f75 100644
--- a/net/tintin++-devel/Makefile
+++ b/net/tintin++-devel/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.walrus.com/pub/avatar/clients/ \
ftp://iclub.nsu.ru/pub/mud/clients/tintin++/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
WRKSRC= ${WRKDIR}/tintin++/src
GNU_CONFIGURE= yes
diff --git a/net/tintin++/Makefile b/net/tintin++/Makefile
index 75b5e39..ab98f75 100644
--- a/net/tintin++/Makefile
+++ b/net/tintin++/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.walrus.com/pub/avatar/clients/ \
ftp://iclub.nsu.ru/pub/mud/clients/tintin++/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
WRKSRC= ${WRKDIR}/tintin++/src
GNU_CONFIGURE= yes
diff --git a/net/ucd-snmp/Makefile b/net/ucd-snmp/Makefile
index a6b0b05..cdc68e0 100644
--- a/net/ucd-snmp/Makefile
+++ b/net/ucd-snmp/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ucd-snmp.ucdavis.edu/ \
ftp://sunsite.cnlab-switch.ch/mirror/ucd-snmp/ \
ftp://ftp.win.or.jp/pub/network/snmp/ucd-snmp/
-MAINTAINER= gpalmer@FreeBSD.ORG
+MAINTAINER= gpalmer@FreeBSD.org
CONFIGURE_ARGS= --enable-shared
diff --git a/net/wb/Makefile b/net/wb/Makefile
index e7ac4ff..7d0a13f 100644
--- a/net/wb/Makefile
+++ b/net/wb/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= mbone
MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/wb/
DISTFILES= i386-wb-1.59.tar.Z
-MAINTAINER= fenner@FreeBSD.ORG
+MAINTAINER= fenner@FreeBSD.org
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index a84ce23..1a06cf1 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://alpha1.linuxberg.com/files/x11/network/ \
http://ethereal.zing.org/distribution/ \
http://ethereal.boehm.org/distribution/
-MAINTAINER= billf@FreeBSD.ORG
+MAINTAINER= billf@FreeBSD.org
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
diff --git a/net/xwhois/Makefile b/net/xwhois/Makefile
index bf02a8f..6550c5e 100644
--- a/net/xwhois/Makefile
+++ b/net/xwhois/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= http://c64.org/~nr/ \
ftp://ftp.infodrom.north.de/pub/unix/gtkbuffet/apps/xwhois/ \
http://www.physics.adelaide.edu.au/~kkennawa/
-MAINTAINER= kris@FreeBSD.ORG
+MAINTAINER= kris@FreeBSD.org
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
diff --git a/net/zebra-devel/Makefile b/net/zebra-devel/Makefile
index 7c8eb0d..36feeee 100644
--- a/net/zebra-devel/Makefile
+++ b/net/zebra-devel/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.zebra.org/pub/zebra/
# you might need debugging, it's a developer release !
#CFLAGS+= -g
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc/zebra
diff --git a/net/zebra-pj/Makefile b/net/zebra-pj/Makefile
index 7c8eb0d..36feeee 100644
--- a/net/zebra-pj/Makefile
+++ b/net/zebra-pj/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.zebra.org/pub/zebra/
# you might need debugging, it's a developer release !
#CFLAGS+= -g
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc/zebra
diff --git a/net/zebra/Makefile b/net/zebra/Makefile
index 7c8eb0d..36feeee 100644
--- a/net/zebra/Makefile
+++ b/net/zebra/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.zebra.org/pub/zebra/
# you might need debugging, it's a developer release !
#CFLAGS+= -g
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc/zebra
diff --git a/news/atp/Makefile b/news/atp/Makefile
index 546daaf..d015761 100644
--- a/news/atp/Makefile
+++ b/news/atp/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: atp
# Version required: 1.50
# Date created: 9 Nov 1997
-# Whom: Donald Burr <dburr@FreeBSD.ORG>
+# Whom: Donald Burr <dburr@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= news
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= system/bbs/mail
-MAINTAINER= dburr@FreeBSD.ORG
+MAINTAINER= dburr@FreeBSD.org
RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip \
unzip:${PORTSDIR}/archivers/unzip
diff --git a/news/aub/Makefile b/news/aub/Makefile
index 50d2bd7..19e309a 100644
--- a/news/aub/Makefile
+++ b/news/aub/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.cdrom.com/pub/perl/CPAN/scripts/news/nntpstuff/aub/ \
ftp://ftp.perl.org/pub/CPAN/scripts/news/nntpstuff/aub/
DISTFILES= aub aub.1 BUG_FIXES
-MAINTAINER= obrien@FreeBSD.ORG
+MAINTAINER= obrien@FreeBSD.org
DIST_SUBDIR= aub
NO_WRKSUBDIR= yes
diff --git a/news/dejasearch/Makefile b/news/dejasearch/Makefile
index 75d7021..16a8397 100644
--- a/news/dejasearch/Makefile
+++ b/news/dejasearch/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: dejasearch
# Version required: 1.6.3
# Date created: 15 March 1999
-# Whom: Kris Kennaway <kris@FreeBSD.ORG>
+# Whom: Kris Kennaway <kris@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITES= http://homemade.hypermart.net/dejasearch/ \
http://homemade.virtualave.net/dejasearch/ \
http://www.freebsd.org/~kris/distfiles/
-MAINTAINER= kris@FreeBSD.ORG
+MAINTAINER= kris@FreeBSD.org
RUN_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
diff --git a/news/diablo/Makefile b/news/diablo/Makefile
index 3d23f0e..a9803c5 100644
--- a/news/diablo/Makefile
+++ b/news/diablo/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= news
MASTER_SITES= http://www.backplane.com/diablo/
EXTRACT_SUFX= .tgz
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
BUILD_DEPENDS= xmake:${PORTSDIR}/devel/xmake
diff --git a/news/dnews/Makefile b/news/dnews/Makefile
index 8715de2..7ea6b93 100644
--- a/news/dnews/Makefile
+++ b/news/dnews/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= news
MASTER_SITES= ftp://ftp.netwinsite.com/pub/netwinsite/dnews/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
Y2K= http://netwinsite.com/dnews_y2k.htm
diff --git a/news/inn-current/Makefile b/news/inn-current/Makefile
index 1f9cd03..23c1e28 100644
--- a/news/inn-current/Makefile
+++ b/news/inn-current/Makefile
@@ -10,7 +10,7 @@ DISTNAME= inn-2.2
CATEGORIES= news
MASTER_SITES= ftp://ftp.isc.org/isc/inn/
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
Y2K= http://www.isc.org/inn-y2k.html
diff --git a/news/inn-stable/Makefile b/news/inn-stable/Makefile
index f5f2e43..b344c02 100644
--- a/news/inn-stable/Makefile
+++ b/news/inn-stable/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= news
MASTER_SITES= http://www.FreeBSD.org/~andreas/download/ \
ftp://ftp.isc.org/isc/inn/snapshots/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
Y2K= http://www.isc.org/inn-y2k.html
diff --git a/news/inn/Makefile b/news/inn/Makefile
index 1f9cd03..23c1e28 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -10,7 +10,7 @@ DISTNAME= inn-2.2
CATEGORIES= news
MASTER_SITES= ftp://ftp.isc.org/isc/inn/
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
Y2K= http://www.isc.org/inn-y2k.html
diff --git a/news/knews/Makefile b/news/knews/Makefile
index 10161fc..b6f5e4b 100644
--- a/news/knews/Makefile
+++ b/news/knews/Makefile
@@ -10,7 +10,7 @@ DISTNAME= knews-1.0b.1
CATEGORIES= news
MASTER_SITES= http://www.matematik.su.se/~kjj/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/news/nn/Makefile b/news/nn/Makefile
index 6d18abb..cf162f9 100644
--- a/news/nn/Makefile
+++ b/news/nn/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.visi.com/users/mtpins/ \
ftp://maroon.webmaster.com/pub/nn/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
MAINTAINER= jooji@webnology.com
IS_INTERACTIVE= yes
diff --git a/news/plor/Makefile b/news/plor/Makefile
index c9d0ce61..79be6e7 100644
--- a/news/plor/Makefile
+++ b/news/plor/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= news
MASTER_SITES= ftp://ftp.psy.unipd.it/pub/pluto/developers/ \
ftp://ftp.unipd.it/pub/Linux/pluto/developers/
-MAINTAINER= hoek@FreeBSD.ORG
+MAINTAINER= hoek@FreeBSD.org
RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip
diff --git a/news/rkive/Makefile b/news/rkive/Makefile
index 5f5f6ac..1f3ecb8 100644
--- a/news/rkive/Makefile
+++ b/news/rkive/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: rkive
# Version required: 3.1
# Date created: 03 Jul 1995
-# Whom: torstenb@FreeBSD.ORG
+# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= news
MASTER_SITES= ftp://ftp.sterling.com/rkive/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
NO_CDROM= "Don't make money from it"
diff --git a/news/slurp/Makefile b/news/slurp/Makefile
index 4ac4e6f..e918aa5 100644
--- a/news/slurp/Makefile
+++ b/news/slurp/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= news
MASTER_SITES= ftp://ftp.demon.co.uk/pub/news/slurp/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= jraynard@FreeBSD.ORG
+MAINTAINER= jraynard@FreeBSD.org
NO_WRKSUBDIR= yes
MAN1= slurp.1
diff --git a/news/trn/Makefile b/news/trn/Makefile
index b18a359..c670c76 100644
--- a/news/trn/Makefile
+++ b/news/trn/Makefile
@@ -10,7 +10,7 @@ DISTNAME= trn-3.6
CATEGORIES= news
MASTER_SITES= ftp://ftp.uu.net/networking/news/readers/trn/
-MAINTAINER= smace@FreeBSD.ORG
+MAINTAINER= smace@FreeBSD.org
RUN_DEPENDS= munpack:${PORTSDIR}/converters/mpack
diff --git a/news/xmitbin/Makefile b/news/xmitbin/Makefile
index c06bec4..b23f93e 100644
--- a/news/xmitbin/Makefile
+++ b/news/xmitbin/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: xmitnin
# Version required: 1.9
# Date created: 29 Nov 1997
-# Whom: Donald Burr <dburr@FreeBSD.ORG>
+# Whom: Donald Burr <dburr@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= news mail
MASTER_SITES= ftp://ftp.cadence.com/utils/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= dburr@FreeBSD.ORG
+MAINTAINER= dburr@FreeBSD.org
MAN1= xmitBin.1
NO_WRKSUBDIR= YES
diff --git a/palm/pilot_makedoc/Makefile b/palm/pilot_makedoc/Makefile
index f4998f8..3cfbc71 100644
--- a/palm/pilot_makedoc/Makefile
+++ b/palm/pilot_makedoc/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: pilot_makedoc
# Version required: 0.7
# Date created: May 10th 1997
-# Whom: jfitz@FreeBSD.ORG
+# Whom: jfitz@FreeBSD.org
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= palm textproc
MASTER_SITES= http://www.concentric.net/~rbram/
DISTFILES= makedoc7.cpp
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
NO_WRKSUBDIR= YES
ALL_TARGET= pilot_makedoc
diff --git a/print/acroread-commfont/Makefile b/print/acroread-commfont/Makefile
index 0b363dd..ddcebc0 100644
--- a/print/acroread-commfont/Makefile
+++ b/print/acroread-commfont/Makefile
@@ -11,7 +11,7 @@ PKGNAME= ${PKG_PRE}acroread-${DISTNAME}-1999.7.20
CATEGORIES?= japanese print
MASTER_SITES= ftp://ftp-pac.adobe.com/pub/adobe/acrobatreader/unix/4.x/
-MAINTAINER= taoka@FreeBSD.ORG
+MAINTAINER= taoka@FreeBSD.org
NO_BUILD= yes
diff --git a/print/acroread/Makefile b/print/acroread/Makefile
index 3553812..11b3b95 100644
--- a/print/acroread/Makefile
+++ b/print/acroread/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.adobe.com/pub/adobe/acrobatreader/unix/3.x/ \
ftp://sunsite.cnlab-switch.ch/mirror/acrobatreader/unix/3.x/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
RUN_DEPENDS= /compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
diff --git a/print/acroread4/Makefile b/print/acroread4/Makefile
index feaa1eb..d031625 100644
--- a/print/acroread4/Makefile
+++ b/print/acroread4/Makefile
@@ -11,7 +11,7 @@ PKGNAME= acroread-4.0
CATEGORIES= print
MASTER_SITES= ftp://ftp-pac.adobe.com/pub/adobe/acrobatreader/unix/4.x/
-MAINTAINER= dima@FreeBSD.ORG
+MAINTAINER= dima@FreeBSD.org
RUN_DEPENDS= /compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
diff --git a/print/acroread5-commfont/Makefile b/print/acroread5-commfont/Makefile
index 0b363dd..ddcebc0 100644
--- a/print/acroread5-commfont/Makefile
+++ b/print/acroread5-commfont/Makefile
@@ -11,7 +11,7 @@ PKGNAME= ${PKG_PRE}acroread-${DISTNAME}-1999.7.20
CATEGORIES?= japanese print
MASTER_SITES= ftp://ftp-pac.adobe.com/pub/adobe/acrobatreader/unix/4.x/
-MAINTAINER= taoka@FreeBSD.ORG
+MAINTAINER= taoka@FreeBSD.org
NO_BUILD= yes
diff --git a/print/acroread5/Makefile b/print/acroread5/Makefile
index feaa1eb..d031625 100644
--- a/print/acroread5/Makefile
+++ b/print/acroread5/Makefile
@@ -11,7 +11,7 @@ PKGNAME= acroread-4.0
CATEGORIES= print
MASTER_SITES= ftp://ftp-pac.adobe.com/pub/adobe/acrobatreader/unix/4.x/
-MAINTAINER= dima@FreeBSD.ORG
+MAINTAINER= dima@FreeBSD.org
RUN_DEPENDS= /compat/linux/usr/i486-linux-libc5/lib/libc.so.5:${PORTSDIR}/emulators/linux_base
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index f6df8b9..df37812 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -8,9 +8,9 @@
DISTNAME= apsfilter-5.1.3
CATEGORIES= print
-MASTER_SITES= http://www.FreeBSD.ORG/~andreas/apsfilter/download/
+MASTER_SITES= http://www.FreeBSD.org/~andreas/apsfilter/download/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript55 \
html2ps:${PORTSDIR}/print/html2ps \
diff --git a/print/apsfilter6/Makefile b/print/apsfilter6/Makefile
index f6df8b9..df37812 100644
--- a/print/apsfilter6/Makefile
+++ b/print/apsfilter6/Makefile
@@ -8,9 +8,9 @@
DISTNAME= apsfilter-5.1.3
CATEGORIES= print
-MASTER_SITES= http://www.FreeBSD.ORG/~andreas/apsfilter/download/
+MASTER_SITES= http://www.FreeBSD.org/~andreas/apsfilter/download/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript55 \
html2ps:${PORTSDIR}/print/html2ps \
diff --git a/print/dvi2xx/Makefile b/print/dvi2xx/Makefile
index 7335bfa2..7878fc3 100644
--- a/print/dvi2xx/Makefile
+++ b/print/dvi2xx/Makefile
@@ -13,7 +13,7 @@ CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
MASTER_SITE_SUBDIR= dviware
-MAINTAINER= jmz@FreeBSD.ORG
+MAINTAINER= jmz@FreeBSD.org
MAN1= dvi2xx.1
IGNOREFILES= ${DISTFILES}
diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index f4a2193..699c356 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.cs.wisc.edu/ghost/aladdin/gs550/ \
DISTFILES= ${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
${HP850_DRV} ${DECRYPT_PDF}
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
Y2K= http://www.cs.wisc.edu/~ghost/aladdin/y2k.html
diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile
index f4a2193..699c356 100644
--- a/print/ghostscript-gnu/Makefile
+++ b/print/ghostscript-gnu/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.cs.wisc.edu/ghost/aladdin/gs550/ \
DISTFILES= ${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
${HP850_DRV} ${DECRYPT_PDF}
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
Y2K= http://www.cs.wisc.edu/~ghost/aladdin/y2k.html
diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index f4a2193..699c356 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.cs.wisc.edu/ghost/aladdin/gs550/ \
DISTFILES= ${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
${HP850_DRV} ${DECRYPT_PDF}
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
Y2K= http://www.cs.wisc.edu/~ghost/aladdin/y2k.html
diff --git a/print/ghostscript55/Makefile b/print/ghostscript55/Makefile
index f4a2193..699c356 100644
--- a/print/ghostscript55/Makefile
+++ b/print/ghostscript55/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.cs.wisc.edu/ghost/aladdin/gs550/ \
DISTFILES= ${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
${HP850_DRV} ${DECRYPT_PDF}
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
Y2K= http://www.cs.wisc.edu/~ghost/aladdin/y2k.html
diff --git a/print/ghostscript6/Makefile b/print/ghostscript6/Makefile
index f4a2193..699c356 100644
--- a/print/ghostscript6/Makefile
+++ b/print/ghostscript6/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.cs.wisc.edu/ghost/aladdin/gs550/ \
DISTFILES= ${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
${HP850_DRV} ${DECRYPT_PDF}
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
Y2K= http://www.cs.wisc.edu/~ghost/aladdin/y2k.html
diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index f4a2193..699c356 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.cs.wisc.edu/ghost/aladdin/gs550/ \
DISTFILES= ${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
${HP850_DRV} ${DECRYPT_PDF}
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
Y2K= http://www.cs.wisc.edu/~ghost/aladdin/y2k.html
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index f4a2193..699c356 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.cs.wisc.edu/ghost/aladdin/gs550/ \
DISTFILES= ${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
${HP850_DRV} ${DECRYPT_PDF}
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
Y2K= http://www.cs.wisc.edu/~ghost/aladdin/y2k.html
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 199fd61..246c579 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: gnomeprint
# Version required: 0.4
# Date created: 15 Jan 1999
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/print/gnomeprint/Makefile b/print/gnomeprint/Makefile
index 199fd61..246c579 100644
--- a/print/gnomeprint/Makefile
+++ b/print/gnomeprint/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: gnomeprint
# Version required: 0.4
# Date created: 15 Jan 1999
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/print/html2ps-a4/Makefile b/print/html2ps-a4/Makefile
index 7ab0cb7..f0ce672 100644
--- a/print/html2ps-a4/Makefile
+++ b/print/html2ps-a4/Makefile
@@ -11,7 +11,7 @@ PKGNAME= html2ps-1.0
CATEGORIES= print www perl5
MASTER_SITES= http://www.tdb.uu.se/~jan/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
BUILD_DEPENDS= mogrify:${PORTSDIR}/graphics/ImageMagick \
djpeg:${PORTSDIR}/graphics/jpeg \
diff --git a/print/html2ps-letter/Makefile b/print/html2ps-letter/Makefile
index 7ab0cb7..f0ce672 100644
--- a/print/html2ps-letter/Makefile
+++ b/print/html2ps-letter/Makefile
@@ -11,7 +11,7 @@ PKGNAME= html2ps-1.0
CATEGORIES= print www perl5
MASTER_SITES= http://www.tdb.uu.se/~jan/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
BUILD_DEPENDS= mogrify:${PORTSDIR}/graphics/ImageMagick \
djpeg:${PORTSDIR}/graphics/jpeg \
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 199fd61..246c579 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: gnomeprint
# Version required: 0.4
# Date created: 15 Jan 1999
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/print/lyx-devel/Makefile b/print/lyx-devel/Makefile
index af6946a..2c530d7 100644
--- a/print/lyx-devel/Makefile
+++ b/print/lyx-devel/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
ftp://alpha.tat.physik.uni-tuebingen.de/pub/lyx/stable/ \
ftp://ftp.sdsc.edu/pub/other/lyx/stable/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX
RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index af6946a..2c530d7 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
ftp://alpha.tat.physik.uni-tuebingen.de/pub/lyx/stable/ \
ftp://ftp.sdsc.edu/pub/other/lyx/stable/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX
RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
diff --git a/print/lyx14/Makefile b/print/lyx14/Makefile
index af6946a..2c530d7 100644
--- a/print/lyx14/Makefile
+++ b/print/lyx14/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
ftp://alpha.tat.physik.uni-tuebingen.de/pub/lyx/stable/ \
ftp://ftp.sdsc.edu/pub/other/lyx/stable/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX
RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
diff --git a/print/lyx15/Makefile b/print/lyx15/Makefile
index af6946a..2c530d7 100644
--- a/print/lyx15/Makefile
+++ b/print/lyx15/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
ftp://alpha.tat.physik.uni-tuebingen.de/pub/lyx/stable/ \
ftp://ftp.sdsc.edu/pub/other/lyx/stable/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX
RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile
index af6946a..2c530d7 100644
--- a/print/lyx16/Makefile
+++ b/print/lyx16/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/ \
ftp://alpha.tat.physik.uni-tuebingen.de/pub/lyx/stable/ \
ftp://ftp.sdsc.edu/pub/other/lyx/stable/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX
RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
diff --git a/print/perlftlib/Makefile b/print/perlftlib/Makefile
index 195d9d9..cedac9f 100644
--- a/print/perlftlib/Makefile
+++ b/print/perlftlib/Makefile
@@ -10,7 +10,7 @@ DISTNAME= perlftlib-1.2
CATEGORIES= print perl5
MASTER_SITES= ftp://ftp.big.or.jp/pub/usr2/jam/ft/ \
${MASTER_SITE_PORTS_JP} \
- http://WWW.FreeBSD.ORG/~sada/distfiles/
+ http://WWW.FreeBSD.org/~sada/distfiles/
MAINTAINER= taoka@FreeBSD.org
diff --git a/print/rtf2latex/Makefile b/print/rtf2latex/Makefile
index abaa4c8..efd4ffd 100644
--- a/print/rtf2latex/Makefile
+++ b/print/rtf2latex/Makefile
@@ -11,7 +11,7 @@ PKGNAME= rtf2latex-1.5
CATEGORIES= print
MASTER_SITES= ftp://ftp.dante.de/pub/tex/support/rtf2latex/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
WRKSRC= ${WRKDIR}/rtf2LaTeX
MAN1= rtf2LaTeX.1
diff --git a/print/xmbibtex/Makefile b/print/xmbibtex/Makefile
index eace33a..5fb7d8c 100644
--- a/print/xmbibtex/Makefile
+++ b/print/xmbibtex/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: xmbibtex
# Version required: 1.5
# Date created: 06 Nov 1997
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= print databases
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/tex
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
REQUIRES_MOTIF= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/src
diff --git a/russian/X.language/Makefile b/russian/X.language/Makefile
index 82c4558..8f6b383 100644
--- a/russian/X.language/Makefile
+++ b/russian/X.language/Makefile
@@ -17,7 +17,7 @@ DISTFILES += Type1.koi8-r.tgz
DISTFILES += Type1.koi8-r.free.tgz
.endif
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
RUN_DEPENDS= ${X11BASE}/bin/xinit:${PORTSDIR}/x11/XFree86
diff --git a/russian/d1489/Makefile b/russian/d1489/Makefile
index e3a5aae..3fb7e3f 100644
--- a/russian/d1489/Makefile
+++ b/russian/d1489/Makefile
@@ -12,6 +12,6 @@ CATEGORIES= russian
MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/convert/char/
EXTRACT_SUFX= .tgz
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
.include <bsd.port.mk>
diff --git a/russian/netscape4.language/Makefile b/russian/netscape4.language/Makefile
index 4e90676a..57d2758 100644
--- a/russian/netscape4.language/Makefile
+++ b/russian/netscape4.language/Makefile
@@ -9,7 +9,7 @@
PKGNAME= ru-netscape-3.01
CATEGORIES= russian www
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
RUN_DEPENDS += ${X11BASE}/lib/X11/nls/ru_SU.KOI8-R:${PORTSDIR}/russian/X.language
RUN_DEPENDS += netscape:${PORTSDIR}/www/netscape3
diff --git a/russian/pgp.language/Makefile b/russian/pgp.language/Makefile
index ead9ee2..518661f 100644
--- a/russian/pgp.language/Makefile
+++ b/russian/pgp.language/Makefile
@@ -11,7 +11,7 @@ PKGNAME= ru-pgp-2.6.3ia
CATEGORIES= russian
MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/crypto/pgp/
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
RESTRICTED= "Crypto"
diff --git a/security/bjorb/Makefile b/security/bjorb/Makefile
index d9f750c..1f8bb3a 100644
--- a/security/bjorb/Makefile
+++ b/security/bjorb/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: bjorb
# Version required: 0.5.5p1
# Date created: May 16, 1998
-# Whom: issei@jp.FreeBSD.ORG
+# Whom: issei@jp.FreeBSD.org
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= bjorb-0.5.5p1
CATEGORIES= net security
MASTER_SITES= ftp://ftp.hitachi-ms.co.jp/pub/bjorb/
-MAINTAINER= issei@jp.FreeBSD.ORG
+MAINTAINER= issei@jp.FreeBSD.org
.if defined(USA_RESIDENT) && ${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO
pre-fetch:
diff --git a/security/checkpassword/Makefile b/security/checkpassword/Makefile
index a5bc3496..1842b10 100644
--- a/security/checkpassword/Makefile
+++ b/security/checkpassword/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: checkpassword
# Version required: 0.81
# Date created: 05 August 1998
-# Whom: sada@FreeBSD.ORG
+# Whom: sada@FreeBSD.org
#
# $FreeBSD$
#
@@ -9,10 +9,10 @@
DISTNAME= checkpassword-0.81
CATEGORIES= security
MASTER_SITES= ftp://koobera.math.uic.edu/www/software/ \
- http://WWW.FreeBSD.ORG/~sada/distfiles/ \
+ http://WWW.FreeBSD.org/~sada/distfiles/ \
${MASTER_SITE_PORTS_JP}
-MAINTAINER= sada@FreeBSD.ORG
+MAINTAINER= sada@FreeBSD.org
ALL_TARGET= it
INSTALL_TARGET= setup
diff --git a/security/donkey/Makefile b/security/donkey/Makefile
index d6ca17b..5dc9590 100644
--- a/security/donkey/Makefile
+++ b/security/donkey/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: donkey
# Version required: 0.5
# Date created: 17 Sep 1996
-# Whom: Masafumi NAKANE <max@FreeBSD.ORG>
+# Whom: Masafumi NAKANE <max@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= donkey-0.5
CATEGORIES= security
MASTER_SITES= ftp://ftp.aist-nara.ac.jp/pub/Security/tool/donkey/
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/obj/FreeBSD
diff --git a/security/fakebo/Makefile b/security/fakebo/Makefile
index f5d7933..5c495de 100644
--- a/security/fakebo/Makefile
+++ b/security/fakebo/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: fakebo
# Version required: 0.3.3
# Date created: 16 March 1999
-# Whom: Kris Kennaway <kris@FreeBSD.ORG>
+# Whom: Kris Kennaway <kris@FreeBSD.org>
#
# $FreeBSD$
#
@@ -15,7 +15,7 @@ MASTER_SITES= http://yi.com/home/KosturjakVlatko/ \
ftp://ftp.ist.utl.pt/pub/linuxberg/files/console/
EXTRACT_SUFX= .tgz
-MAINTAINER= kris@FreeBSD.ORG
+MAINTAINER= kris@FreeBSD.org
WRKSRC= ${WRKDIR}/${PKGNAME}
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 61ef950..6280440 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: gnupg
# Version required: 0.9.10
# Date created: Sep 30, 1998
-# Whom: kuriyama@FreeBSD.ORG
+# Whom: kuriyama@FreeBSD.org
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.guug.de/pub/gcrypt/ \
ftp://pgp.iijlab.net/pub/gnupg/ \
ftp://ftp.win.or.jp/pub/network/gnupg/
-MAINTAINER= kuriyama@FreeBSD.ORG
+MAINTAINER= kuriyama@FreeBSD.org
RESTRICTED= "Crypto; export-controlled"
GNU_CONFIGURE= YES
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index 61ef950..6280440 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: gnupg
# Version required: 0.9.10
# Date created: Sep 30, 1998
-# Whom: kuriyama@FreeBSD.ORG
+# Whom: kuriyama@FreeBSD.org
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.guug.de/pub/gcrypt/ \
ftp://pgp.iijlab.net/pub/gnupg/ \
ftp://ftp.win.or.jp/pub/network/gnupg/
-MAINTAINER= kuriyama@FreeBSD.ORG
+MAINTAINER= kuriyama@FreeBSD.org
RESTRICTED= "Crypto; export-controlled"
GNU_CONFIGURE= YES
diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile
index e24b12e..c493c76 100644
--- a/security/krb5-16/Makefile
+++ b/security/krb5-16/Makefile
@@ -1,7 +1,7 @@
# Ports collection Makefile for: MIT Kerberos V
# Version required: 1.0.5
# Date created: 6/5/1998
-# Whom: nectar@FreeBSD.ORG
+# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ DISTFILES= krb5-1.0.6.src.tar.gz \
krb5-1.0.6.doc.tar.gz \
krb5-1.0.6.crypto.tar.gz
-MAINTAINER= nectar@FreeBSD.ORG
+MAINTAINER= nectar@FreeBSD.org
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/security/krb5-17/Makefile b/security/krb5-17/Makefile
index e24b12e..c493c76 100644
--- a/security/krb5-17/Makefile
+++ b/security/krb5-17/Makefile
@@ -1,7 +1,7 @@
# Ports collection Makefile for: MIT Kerberos V
# Version required: 1.0.5
# Date created: 6/5/1998
-# Whom: nectar@FreeBSD.ORG
+# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ DISTFILES= krb5-1.0.6.src.tar.gz \
krb5-1.0.6.doc.tar.gz \
krb5-1.0.6.crypto.tar.gz
-MAINTAINER= nectar@FreeBSD.ORG
+MAINTAINER= nectar@FreeBSD.org
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
index e24b12e..c493c76 100644
--- a/security/krb5-appl/Makefile
+++ b/security/krb5-appl/Makefile
@@ -1,7 +1,7 @@
# Ports collection Makefile for: MIT Kerberos V
# Version required: 1.0.5
# Date created: 6/5/1998
-# Whom: nectar@FreeBSD.ORG
+# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ DISTFILES= krb5-1.0.6.src.tar.gz \
krb5-1.0.6.doc.tar.gz \
krb5-1.0.6.crypto.tar.gz
-MAINTAINER= nectar@FreeBSD.ORG
+MAINTAINER= nectar@FreeBSD.org
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index e24b12e..c493c76 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -1,7 +1,7 @@
# Ports collection Makefile for: MIT Kerberos V
# Version required: 1.0.5
# Date created: 6/5/1998
-# Whom: nectar@FreeBSD.ORG
+# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ DISTFILES= krb5-1.0.6.src.tar.gz \
krb5-1.0.6.doc.tar.gz \
krb5-1.0.6.crypto.tar.gz
-MAINTAINER= nectar@FreeBSD.ORG
+MAINTAINER= nectar@FreeBSD.org
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/security/libident/Makefile b/security/libident/Makefile
index fa85cdf..fbf6522 100644
--- a/security/libident/Makefile
+++ b/security/libident/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: libident
# Version required: 0.21
# Date created: 9 October 1995
-# Whom: torstenb@FreeBSD.ORG
+# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= libident-0.22
CATEGORIES= devel net security
MASTER_SITES= ftp://ftp.lysator.liu.se/pub/ident/libs/
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
ALL_TARGET= freebsd
MAN3= ident.3
diff --git a/security/p5-Authen-Radius/Makefile b/security/p5-Authen-Radius/Makefile
index 4927834..3ca9be6 100644
--- a/security/p5-Authen-Radius/Makefile
+++ b/security/p5-Authen-Radius/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= security net perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Authen
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/MD5.pm:${PORTSDIR}/security/p5-MD5
USE_PERL5= YES
diff --git a/security/p5-Crypt-DES/Makefile b/security/p5-Crypt-DES/Makefile
index 59cf6b6..b51cab1 100644
--- a/security/p5-Crypt-DES/Makefile
+++ b/security/p5-Crypt-DES/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= security perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Crypt
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
RESTRICTED= "Crypto; export-controlled"
diff --git a/security/p5-Crypt-IDEA/Makefile b/security/p5-Crypt-IDEA/Makefile
index d5bc2a1..b208a70 100644
--- a/security/p5-Crypt-IDEA/Makefile
+++ b/security/p5-Crypt-IDEA/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= security perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Crypt
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
RESTRICTED= "Crypto; export-controlled"
diff --git a/security/p5-Digest-MD5/Makefile b/security/p5-Digest-MD5/Makefile
index eeb051f..daca63d 100644
--- a/security/p5-Digest-MD5/Makefile
+++ b/security/p5-Digest-MD5/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= security perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= MD5
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
USE_PERL5= YES
diff --git a/security/p5-MD5/Makefile b/security/p5-MD5/Makefile
index fe87d89..7063798 100644
--- a/security/p5-MD5/Makefile
+++ b/security/p5-MD5/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= security perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= MD5
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/security/p5-PGP/Makefile b/security/p5-PGP/Makefile
index afd9577..35644e1 100644
--- a/security/p5-PGP/Makefile
+++ b/security/p5-PGP/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= security perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= PGP
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
BUILD_DEPENDS= pgp:${PORTSDIR}/security/pgp
diff --git a/security/pgp/Makefile b/security/pgp/Makefile
index 2c769c3..93777ea 100644
--- a/security/pgp/Makefile
+++ b/security/pgp/Makefile
@@ -12,7 +12,7 @@
DISTNAME= pgp262s
CATEGORIES= security
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
# Need to define USA_RESIDENT to YES or NO
IS_INTERACTIVE= YES
diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile
index d361cc7..4daff1a 100644
--- a/security/pgp5/Makefile
+++ b/security/pgp5/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.ifi.uio.no/pub/pgp/5.0/unix/ \
ftp://ftp.doc.ic.ac.uk/pub/Mirrors/ftp.ifi.uio.no/pub/pgp/5.0/unix/
EXTRACT_SUFX= -unix-src.tar.gz
-MAINTAINER= markm@FreeBSD.ORG
+MAINTAINER= markm@FreeBSD.org
Y2K= http://www.pgpi.com/faq/pgpi.shtml#Year2000
diff --git a/security/pgp6/Makefile b/security/pgp6/Makefile
index d361cc7..4daff1a 100644
--- a/security/pgp6/Makefile
+++ b/security/pgp6/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.ifi.uio.no/pub/pgp/5.0/unix/ \
ftp://ftp.doc.ic.ac.uk/pub/Mirrors/ftp.ifi.uio.no/pub/pgp/5.0/unix/
EXTRACT_SUFX= -unix-src.tar.gz
-MAINTAINER= markm@FreeBSD.ORG
+MAINTAINER= markm@FreeBSD.org
Y2K= http://www.pgpi.com/faq/pgpi.shtml#Year2000
diff --git a/security/pidentd/Makefile b/security/pidentd/Makefile
index 6b3fc47..db4076a 100644
--- a/security/pidentd/Makefile
+++ b/security/pidentd/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= security net
MASTER_SITES= ftp://ftp.lysator.liu.se/pub/ident/servers/ \
ftp://ftp.fu-berlin.de/unix/security/ident/servers/
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
ALL_TARGET= freebsd
MAKE_ENV= REALPREFIX=${PREFIX}
diff --git a/security/rsaref/Makefile b/security/rsaref/Makefile
index 8d0bfb4..69f1666 100644
--- a/security/rsaref/Makefile
+++ b/security/rsaref/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES= ftp://utopia.hacktic.nl/pub/replay/pub/crypto/LIBS/rsa/ \
ftp://ftp.nstu.ru/pub/sources/security/crypt/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
WRKSRC= ${WRKDIR}/source
RESTRICTED= "Crypto"
diff --git a/security/smurflog/Makefile b/security/smurflog/Makefile
index 74b474c..f3be28d 100644
--- a/security/smurflog/Makefile
+++ b/security/smurflog/Makefile
@@ -1,7 +1,7 @@
# Ports collection Makefile for: smurflog
# Version required: 1.0
# Date created: 7/06/1998
-# Whom: nectar@FreeBSD.ORG
+# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.bitchx.org/pub/bitchx/files/ \
ftp://ftp.buk.net/pub/software/bitchx/files/ \
http://www.nectar.cc/distfiles/
-MAINTAINER= nectar@FreeBSD.ORG
+MAINTAINER= nectar@FreeBSD.org
GNU_CONFIGURE= YES
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 48621be..b8237c1 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: ssh
# Version required: 1.2.*
# Date created: 30 Jul 1995
-# Whom: torstenb@FreeBSD.ORG
+# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ DISTNAME= ssh-1.2.27
CATEGORIES= security net
MASTER_SITES= ftp://ftp.cs.hut.fi/pub/ssh/
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
# You can set USA_RESIDENT appropriately in /etc/make.conf if this bugs you..
diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile
index 4cdc672..569014a 100644
--- a/security/ssh2/Makefile
+++ b/security/ssh2/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: ssh2
# Version required: 2.0.*
# Date created: 5 Oct 1998
-# Whom: Issei Suzuki <issei@jp.FreeBSD.ORG>
+# Whom: Issei Suzuki <issei@jp.FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 4b50330..3978545 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -11,7 +11,7 @@ PKGNAME= sudo-1.5.9.4
CATEGORIES= security
MASTER_SITES= ftp://ftp.cs.colorado.edu/pub/sysadmin/sudo/
-MAINTAINER= mharo@FreeBSD.ORG
+MAINTAINER= mharo@FreeBSD.org
WRKSRC= ${WRKDIR}/sudo.v1.5.9p4
GNU_CONFIGURE= yes
diff --git a/security/swatch/Makefile b/security/swatch/Makefile
index 1b917d0..4077619 100644
--- a/security/swatch/Makefile
+++ b/security/swatch/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= security sysutils
MASTER_SITES= ftp://ftp.stanford.edu/general/security-tools/swatch/ \
ftp://ftp.cert.dfn.de/pub/tools/audit/swatch/
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
NO_BUILD= YES
diff --git a/security/tcp_wrapper/Makefile b/security/tcp_wrapper/Makefile
index 1bcfba9..9f55097 100644
--- a/security/tcp_wrapper/Makefile
+++ b/security/tcp_wrapper/Makefile
@@ -11,7 +11,7 @@ PKGNAME= tcp_wrappers-7.6
CATEGORIES= security net
MASTER_SITES= ftp://ftp.porcupine.org/pub/security/
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
ALL_TARGET= freebsd
MAN3= hosts_access.3
diff --git a/security/xinetd/Makefile b/security/xinetd/Makefile
index 8f4aea3..f0ee8a6 100644
--- a/security/xinetd/Makefile
+++ b/security/xinetd/Makefile
@@ -10,7 +10,7 @@ DISTNAME= xinetd-2.1.8.6b6
CATEGORIES= security
MASTER_SITES= http://synack.net/xinetd/
-MAINTAINER= markm@FreeBSD.ORG
+MAINTAINER= markm@FreeBSD.org
FETCH_BEFORE_ARGS= -b
GNU_CONFIGURE= yes
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index e868d8f..993499c 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= bash
DISTFILES= bash-2.03.tar.gz bash-doc-2.03.tar.gz
.endif
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
GNU_CONFIGURE= Yes
CONFIGURE_ARGS= --with-installed-readline
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index e868d8f..993499c 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= bash
DISTFILES= bash-2.03.tar.gz bash-doc-2.03.tar.gz
.endif
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
GNU_CONFIGURE= Yes
CONFIGURE_ARGS= --with-installed-readline
diff --git a/shells/bash3/Makefile b/shells/bash3/Makefile
index e868d8f..993499c 100644
--- a/shells/bash3/Makefile
+++ b/shells/bash3/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= bash
DISTFILES= bash-2.03.tar.gz bash-doc-2.03.tar.gz
.endif
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
GNU_CONFIGURE= Yes
CONFIGURE_ARGS= --with-installed-readline
diff --git a/shells/esh/Makefile b/shells/esh/Makefile
index 486072c..9c450c3 100644
--- a/shells/esh/Makefile
+++ b/shells/esh/Makefile
@@ -1,7 +1,7 @@
# Ports collection Makefile for: esh
# Version required: 0.8
# Date created: 05/20/1999
-# Whom: nectar@FreeBSD.ORG
+# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= shells
MASTER_SITES= http://esh.netpedia.net/ \
http://www.nectar.cc/distfiles/
-MAINTAINER= nectar@FreeBSD.ORG
+MAINTAINER= nectar@FreeBSD.org
WRKSRC= ${WRKDIR}/esh
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index 0c802d8..34ad386 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -11,7 +11,7 @@ PKGNAME= tcsh-6.09.00
CATEGORIES= shells
MASTER_SITES= ftp://ftp.astron.com/pub/tcsh/
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
Y2K= ftp://ftp.astron.com/pub/tcsh/Y2K
diff --git a/shells/zsh-devel/Makefile b/shells/zsh-devel/Makefile
index 37f42ec..20626bc 100644
--- a/shells/zsh-devel/Makefile
+++ b/shells/zsh-devel/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.zsh.org/zsh/ \
ftp://ftp.ips.oz.au/pub/packages/zsh/ \
ftp://ftp.uit.no/pub/unix/shells/zsh/
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-zsh-mem --enable-zsh-secure-free --enable-dynamic
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index a247bde..c6fa4f2 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -17,7 +17,7 @@ MASTER_SITES= ftp://ftp.sterling.com/zsh/ \
ftp://ftp.ips.oz.au/pub/packages/zsh/ \
ftp://ftp.uit.no/pub/unix/shells/zsh/
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
GNU_CONFIGURE= yes
MAN1= zsh.1 zshbuiltins.1 zshcompctl.1 zshexpn.1 zshmisc.1 \
diff --git a/sysutils/bchunk/Makefile b/sysutils/bchunk/Makefile
index 723e42b..1ac3b64 100644
--- a/sysutils/bchunk/Makefile
+++ b/sysutils/bchunk/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://hes.iki.fi/bchunk/ \
${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= utils/disk-management
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
ALL_TARGET=
diff --git a/sysutils/cd-write/Makefile b/sysutils/cd-write/Makefile
index d56288a..1203e71 100644
--- a/sysutils/cd-write/Makefile
+++ b/sysutils/cd-write/Makefile
@@ -8,7 +8,7 @@
DISTNAME= cd-write-1.4.1
CATEGORIES= sysutils
-MASTER_SITES= http://www.FreeBSD.ORG/~jmz/
+MASTER_SITES= http://www.FreeBSD.org/~jmz/
MAINTAINER= jmz@FreeBSD.org
diff --git a/sysutils/cfengine/Makefile b/sysutils/cfengine/Makefile
index a3b1a31..6db1c48 100644
--- a/sysutils/cfengine/Makefile
+++ b/sysutils/cfengine/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: cfengine
# Version required: 1.4.12
# Date created: March 16, 1998
-# Whom: jseger@FreeBSD.ORG
+# Whom: jseger@FreeBSD.org
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= cfengine
-MAINTAINER= jseger@FreeBSD.ORG
+MAINTAINER= jseger@FreeBSD.org
.if defined(PACKAGE_BUILDING) && !exists(/usr/include/tcpd.h)
LIB_DEPENDS= wrap.7:${PORTSDIR}/security/tcp_wrapper
diff --git a/sysutils/cfengine2/Makefile b/sysutils/cfengine2/Makefile
index a3b1a31..6db1c48 100644
--- a/sysutils/cfengine2/Makefile
+++ b/sysutils/cfengine2/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: cfengine
# Version required: 1.4.12
# Date created: March 16, 1998
-# Whom: jseger@FreeBSD.ORG
+# Whom: jseger@FreeBSD.org
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= cfengine
-MAINTAINER= jseger@FreeBSD.ORG
+MAINTAINER= jseger@FreeBSD.org
.if defined(PACKAGE_BUILDING) && !exists(/usr/include/tcpd.h)
LIB_DEPENDS= wrap.7:${PORTSDIR}/security/tcp_wrapper
diff --git a/sysutils/cfengine3-legacy/Makefile b/sysutils/cfengine3-legacy/Makefile
index a3b1a31..6db1c48 100644
--- a/sysutils/cfengine3-legacy/Makefile
+++ b/sysutils/cfengine3-legacy/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: cfengine
# Version required: 1.4.12
# Date created: March 16, 1998
-# Whom: jseger@FreeBSD.ORG
+# Whom: jseger@FreeBSD.org
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= cfengine
-MAINTAINER= jseger@FreeBSD.ORG
+MAINTAINER= jseger@FreeBSD.org
.if defined(PACKAGE_BUILDING) && !exists(/usr/include/tcpd.h)
LIB_DEPENDS= wrap.7:${PORTSDIR}/security/tcp_wrapper
diff --git a/sysutils/cfengine3/Makefile b/sysutils/cfengine3/Makefile
index a3b1a31..6db1c48 100644
--- a/sysutils/cfengine3/Makefile
+++ b/sysutils/cfengine3/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: cfengine
# Version required: 1.4.12
# Date created: March 16, 1998
-# Whom: jseger@FreeBSD.ORG
+# Whom: jseger@FreeBSD.org
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= cfengine
-MAINTAINER= jseger@FreeBSD.ORG
+MAINTAINER= jseger@FreeBSD.org
.if defined(PACKAGE_BUILDING) && !exists(/usr/include/tcpd.h)
LIB_DEPENDS= wrap.7:${PORTSDIR}/security/tcp_wrapper
diff --git a/sysutils/comconsole/Makefile b/sysutils/comconsole/Makefile
index 680225c..21388a6 100644
--- a/sysutils/comconsole/Makefile
+++ b/sysutils/comconsole/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: comconsole
# Version required: 0.1
# Date created: 27 Dec 1998
-# Whom: SADA Kenji <sada@FreeBSD.ORG>
+# Whom: SADA Kenji <sada@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= sysutils
MASTER_SITES= #
DISTFILES=
-MAINTAINER= sada@FreeBSD.ORG
+MAINTAINER= sada@FreeBSD.org
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/sysutils/copytape/Makefile b/sysutils/copytape/Makefile
index 4798c00..984a078 100644
--- a/sysutils/copytape/Makefile
+++ b/sysutils/copytape/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE= ${MASTER_SITE_COMP_SOURCES}
MASTER_SITE_SUBDIR= unix/volume8
EXTRACT_SUFX= .Z
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
BUILD_DEPENDS= gunshar:${PORTSDIR}/archivers/gshar+gunshar
diff --git a/sysutils/doconfig/Makefile b/sysutils/doconfig/Makefile
index 77302eb..aed21a0 100644
--- a/sysutils/doconfig/Makefile
+++ b/sysutils/doconfig/Makefile
@@ -1,7 +1,7 @@
# Ports collection Makefile for: doconfig
# Version required: 1.1
# Date created: 7/27/1998
-# Whom: nectar@FreeBSD.ORG
+# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= doconfig-1.1
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.cold.org/pub/brandon/
-MAINTAINER= nectar@FreeBSD.ORG
+MAINTAINER= nectar@FreeBSD.org
MAN8= autokernconf.8 doconfig.8
diff --git a/sysutils/glload/Makefile b/sysutils/glload/Makefile
index 91cddcf..495d1ea 100644
--- a/sysutils/glload/Makefile
+++ b/sysutils/glload/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: glload
# Version required: 0.4.0
# Date created: 04 Dec 1998
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= sysutils
MASTER_SITES= http://glload.netpedia.net/source/ \
http://www.freebsd.org/~vanilla/
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= MesaGL.14:${PORTSDIR}/graphics/Mesa3
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 26fc505..0f71a7c 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: control-center
# Version required: 1.0.6
# Date created: 29 Dec 1998
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/control-center
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore
RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore
diff --git a/sysutils/gnome-control-center1/Makefile b/sysutils/gnome-control-center1/Makefile
index 26fc505..0f71a7c 100644
--- a/sysutils/gnome-control-center1/Makefile
+++ b/sysutils/gnome-control-center1/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: control-center
# Version required: 1.0.6
# Date created: 29 Dec 1998
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/control-center
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore
RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore
diff --git a/sysutils/gnomecontrolcenter/Makefile b/sysutils/gnomecontrolcenter/Makefile
index 26fc505..0f71a7c 100644
--- a/sysutils/gnomecontrolcenter/Makefile
+++ b/sysutils/gnomecontrolcenter/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: control-center
# Version required: 1.0.6
# Date created: 29 Dec 1998
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/control-center
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore
RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 26fc505..0f71a7c 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: control-center
# Version required: 1.0.6
# Date created: 29 Dec 1998
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/control-center
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore
RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore
diff --git a/sysutils/gtar/Makefile b/sysutils/gtar/Makefile
index 7fd2453..81194ff 100644
--- a/sysutils/gtar/Makefile
+++ b/sysutils/gtar/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= tar
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
GNU_CONFIGURE= yes
CONFIGURE_ARGS=--program-prefix=g
diff --git a/sysutils/less/Makefile b/sysutils/less/Makefile
index 0d8cbd4..7f1584a 100644
--- a/sysutils/less/Makefile
+++ b/sysutils/less/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= less
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
GNU_CONFIGURE= yes
MAN1= less.1 lesskey.1
diff --git a/sysutils/libretto-config/Makefile b/sysutils/libretto-config/Makefile
index bbdcb4b..fe19a10 100644
--- a/sysutils/libretto-config/Makefile
+++ b/sysutils/libretto-config/Makefile
@@ -11,7 +11,7 @@ PKGNAME= ${PROGRAM_NAME}-1.0b5
CATEGORIES= sysutils
MASTER_SITES= http://club.pep.ne.jp/~ishioka/Software/Linux/libapm/
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
ONLY_FOR_ARCHS= i386
diff --git a/sysutils/mkisofs-devel/Makefile b/sysutils/mkisofs-devel/Makefile
index 501b3b1..cae00c5 100644
--- a/sysutils/mkisofs-devel/Makefile
+++ b/sysutils/mkisofs-devel/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/mkisofs/ \
ftp://ftp.gwdg.de/pub/linux/misc/cdrecord/mkisofs/ \
ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/mkisofs/
-MAINTAINER= dirk@FreeBSD.ORG
+MAINTAINER= dirk@FreeBSD.org
GNU_CONFIGURE= yes
MAKE_FLAGS= XCFLAGS='-c -I. ${CFLAGS} -DSYSTEM_ID_DEFAULT=\"FREEBSD\"' -f
diff --git a/sysutils/mkisofs/Makefile b/sysutils/mkisofs/Makefile
index 501b3b1..cae00c5 100644
--- a/sysutils/mkisofs/Makefile
+++ b/sysutils/mkisofs/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/mkisofs/ \
ftp://ftp.gwdg.de/pub/linux/misc/cdrecord/mkisofs/ \
ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/mkisofs/
-MAINTAINER= dirk@FreeBSD.ORG
+MAINTAINER= dirk@FreeBSD.org
GNU_CONFIGURE= yes
MAKE_FLAGS= XCFLAGS='-c -I. ${CFLAGS} -DSYSTEM_ID_DEFAULT=\"FREEBSD\"' -f
diff --git a/sysutils/no-login/Makefile b/sysutils/no-login/Makefile
index f8405ec..3720af0 100644
--- a/sysutils/no-login/Makefile
+++ b/sysutils/no-login/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: nologin
# Version required: 1.0
# Date created: 15 Jul 1998
-# Whom: Donald Burr <dburr@FreeBSD.ORG>
+# Whom: Donald Burr <dburr@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.xmission.com/pub/users/s/softweyr/pub/
DISTFILES= nologin.c nologin.8
-MAINTAINER= dburr@FreeBSD.ORG
+MAINTAINER= dburr@FreeBSD.org
DIST_SUBDIR= nologin
NO_WRKSUBDIR= YES
diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile
index 9379043..b114232 100644
--- a/sysutils/screen/Makefile
+++ b/sysutils/screen/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \
${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= screen
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
GNU_CONFIGURE= yes
MAN1= screen.1
diff --git a/sysutils/star/Makefile b/sysutils/star/Makefile
index 8019440..177d390 100644
--- a/sysutils/star/Makefile
+++ b/sysutils/star/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.fokus.gmd.de/pub/unix/star/ \
${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= utils/compress
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
USE_GMAKE= yes
MAKE_ENV= MAKEPROG=gmake CCOM=${CC}
diff --git a/sysutils/tua/Makefile b/sysutils/tua/Makefile
index ff55abe..ba16e87 100644
--- a/sysutils/tua/Makefile
+++ b/sysutils/tua/Makefile
@@ -10,7 +10,7 @@ DISTNAME= tua-4.0
CATEGORIES= sysutils
MASTER_SITES= ftp://itnsg1.cineca.it/pub/local/tua/
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
GNU_CONFIGURE= yes
MAN1= tua.1
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index a476b64..6cfaef6 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -10,7 +10,7 @@ DISTNAME= webmin-0.73
CATEGORIES= sysutils
MASTER_SITES= http://www.webmin.com/webmin/download/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
NO_BUILD= yes
IS_INTERACTIVE= yes
diff --git a/sysutils/xdu/Makefile b/sysutils/xdu/Makefile
index aea0947..321f424 100644
--- a/sysutils/xdu/Makefile
+++ b/sysutils/xdu/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.arl.mil/pub/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
NO_WRKSUBDIR= yes
USE_IMAKE= yes
diff --git a/sysutils/xfsm/Makefile b/sysutils/xfsm/Makefile
index 3f1e7d0..e955d02 100644
--- a/sysutils/xfsm/Makefile
+++ b/sysutils/xfsm/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: xfsm
# Version required: 1.97
# Date Created: 24 Nov 1997
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= sysutils
MASTER_SITES= http://www.peoplesoft.com/peoplepages/g/robert_gasch/src/
EXTRACT_SUFX= .tgz
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
USE_IMAKE= yes
MAN1= xfsm.1
diff --git a/sysutils/xsysstats/Makefile b/sysutils/xsysstats/Makefile
index ec84e05e..9e0c306 100644
--- a/sysutils/xsysstats/Makefile
+++ b/sysutils/xsysstats/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= utilities
-MAINTAINER= obrien@FreeBSD.ORG
+MAINTAINER= obrien@FreeBSD.org
USE_IMAKE= yes
MAN1= xsysstats.1
diff --git a/textproc/cocoon/Makefile b/textproc/cocoon/Makefile
index a73631f..74100f9 100644
--- a/textproc/cocoon/Makefile
+++ b/textproc/cocoon/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: Coccon
# Version required: 1.3.1
# Date created: 27 June 1999
-# Whom: Jun Kuriyama <kuriyama@FreeBSD.ORG>
+# Whom: Jun Kuriyama <kuriyama@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= textproc www java
MASTER_SITES= http://java.apache.org/cocoon/dist/
EXTRACT_SUFX= .jar
-MAINTAINER= kuriyama@FreeBSD.ORG
+MAINTAINER= kuriyama@FreeBSD.org
RUN_DEPENDS= ${PREFIX}/libexec/apache/mod_jserv.so:${PORTSDIR}/www/apache-jserv
# ${PREFIX}/share/java/classes/lotusxsl.jar:${PORTSDIR}/textproc/lotusxsl
diff --git a/textproc/docbook-241/Makefile b/textproc/docbook-241/Makefile
index 871f1c5..01daee2 100644
--- a/textproc/docbook-241/Makefile
+++ b/textproc/docbook-241/Makefile
@@ -13,7 +13,7 @@ CATEGORIES= textproc
MASTER_SITES= ftp://ftp.ora.com/pub/davenport/
DISTFILES= docbk241.tar.Z
-MAINTAINER= nik@FreeBSD.ORG
+MAINTAINER= nik@FreeBSD.org
RUN_DEPENDS= ${ISOCAT}:${PORTSDIR}/textproc/iso8879
diff --git a/textproc/docbook-300/Makefile b/textproc/docbook-300/Makefile
index 6754ff0..35ced29 100644
--- a/textproc/docbook-300/Makefile
+++ b/textproc/docbook-300/Makefile
@@ -13,7 +13,7 @@ CATEGORIES= textproc
MASTER_SITES= ftp://ftp.ora.com/pub/davenport/
DISTFILES= docbk30.tar.Z
-MAINTAINER= nik@FreeBSD.ORG
+MAINTAINER= nik@FreeBSD.org
RUN_DEPENDS= ${ISOCAT}:${PORTSDIR}/textproc/iso8879
diff --git a/textproc/docbook-310/Makefile b/textproc/docbook-310/Makefile
index 6c1f7b6..3f1fa47 100644
--- a/textproc/docbook-310/Makefile
+++ b/textproc/docbook-310/Makefile
@@ -13,7 +13,7 @@ PKGNAME= docbook-3.1
CATEGORIES= textproc
MASTER_SITES= http://www.oasis-open.org/docbook/docbook/3.1/
-MAINTAINER= nik@FreeBSD.ORG
+MAINTAINER= nik@FreeBSD.org
RUN_DEPENDS= ${ISOCAT}:${PORTSDIR}/textproc/iso8879
diff --git a/textproc/docbook-sk/Makefile b/textproc/docbook-sk/Makefile
index 2eb29e4..a655cd5 100644
--- a/textproc/docbook-sk/Makefile
+++ b/textproc/docbook-sk/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= textproc
MASTER_SITES= http://nwalsh.com/docbook/xml/3.1.4/
EXTRACT_SUFX= .zip
-MAINTAINER= kuriyama@FreeBSD.ORG
+MAINTAINER= kuriyama@FreeBSD.org
BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
diff --git a/textproc/docbook-xml/Makefile b/textproc/docbook-xml/Makefile
index 2eb29e4..a655cd5 100644
--- a/textproc/docbook-xml/Makefile
+++ b/textproc/docbook-xml/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= textproc
MASTER_SITES= http://nwalsh.com/docbook/xml/3.1.4/
EXTRACT_SUFX= .zip
-MAINTAINER= kuriyama@FreeBSD.ORG
+MAINTAINER= kuriyama@FreeBSD.org
BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
diff --git a/textproc/dsssl-docbook-modular/Makefile b/textproc/dsssl-docbook-modular/Makefile
index 30784fe..e81d4a4 100644
--- a/textproc/dsssl-docbook-modular/Makefile
+++ b/textproc/dsssl-docbook-modular/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= textproc
MASTER_SITES= http://nwalsh.com/docbook/dsssl/
DISTFILES= ${DISTNAME}.zip ${DISTNAME}d.zip
-MAINTAINER= kuriyama@FreeBSD.ORG
+MAINTAINER= kuriyama@FreeBSD.org
BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip \
${PREFIX}/share/sgml/docbook/3.0/catalog:${PORTSDIR}/textproc/docbook-300
diff --git a/textproc/dtd-catalogs/Makefile b/textproc/dtd-catalogs/Makefile
index 57592ea..401b1ad 100644
--- a/textproc/dtd-catalogs/Makefile
+++ b/textproc/dtd-catalogs/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= textproc
MASTER_SITES= # empty
DISTFILES= # empty
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
RUN_DEPENDS= ${ISO8879_CAT}:${PORTSDIR}/textproc/iso8879 \
${ISO12083_CAT}:${PORTSDIR}/textproc/iso12083 \
diff --git a/textproc/html/Makefile b/textproc/html/Makefile
index 337154f..13e4019 100644
--- a/textproc/html/Makefile
+++ b/textproc/html/Makefile
@@ -10,7 +10,7 @@ DISTNAME= html-4.0b
CATEGORIES= textproc
MASTER_SITES= http://fallout.campusview.indiana.edu/ports/distfiles/
-MAINTAINER= jfieber@FreeBSD.ORG
+MAINTAINER= jfieber@FreeBSD.org
NO_MTREE= yes
EXTRACT_ONLY= # empty
diff --git a/textproc/iso12083/Makefile b/textproc/iso12083/Makefile
index e3a0b47..1e125ff 100644
--- a/textproc/iso12083/Makefile
+++ b/textproc/iso12083/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= textproc
MASTER_SITES= ftp://info.ex.ac.uk/pub/SGML/ISO-12083/
DISTFILES= article.dtd book.dtd maths.dtd serial.dtd
-MAINTAINER= jfieber@FreeBSD.ORG
+MAINTAINER= jfieber@FreeBSD.org
DIST_SUBDIR= iso12083
diff --git a/textproc/iso8879/Makefile b/textproc/iso8879/Makefile
index 5c67d30..f4f16cd 100644
--- a/textproc/iso8879/Makefile
+++ b/textproc/iso8879/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= textproc
MASTER_SITES= http://fallout.campusview.indiana.edu/ports/distfiles/
EXTRACT_SUFX= .zip
-MAINTAINER= jfieber@FreeBSD.ORG
+MAINTAINER= jfieber@FreeBSD.org
BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index 07608a3..aeb0945 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -10,7 +10,7 @@ DISTNAME= jade-1.2.1
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.jclark.com/pub/jade/
-MAINTAINER= jfieber@FreeBSD.ORG
+MAINTAINER= jfieber@FreeBSD.org
.if ${MACHINE_ARCH} == "alpha"
BROKEN= nsgmls coredumps in static constructors
diff --git a/textproc/linuxdoc/Makefile b/textproc/linuxdoc/Makefile
index 4bc0eac..9523989 100644
--- a/textproc/linuxdoc/Makefile
+++ b/textproc/linuxdoc/Makefile
@@ -10,7 +10,7 @@ DISTNAME= linuxdoc-1.1
CATEGORIES= textproc
MASTER_SITES= http://fallout.campusview.indiana.edu/ports/distfiles/
-MAINTAINER= jfieber@FreeBSD.ORG
+MAINTAINER= jfieber@FreeBSD.org
RUN_DEPENDS= ${ISOCAT}:${PORTSDIR}/textproc/iso8879
diff --git a/textproc/lotusxsl/Makefile b/textproc/lotusxsl/Makefile
index 048d339..11d100f 100644
--- a/textproc/lotusxsl/Makefile
+++ b/textproc/lotusxsl/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: LotusXSL
# Version required: 0.17.4
# Date created: 23 June 1999
-# Whom: Jun Kuriyama <kuriyama@FreeBSD.ORG>
+# Whom: Jun Kuriyama <kuriyama@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.alphaworks.ibm.com/formula/lotusxsl/
#MASTER_SITES= http://apps.alphaworks.ibm.com/technologies/lotusxsl/
EXTRACT_SUFX= .zip
-MAINTAINER= kuriyama@FreeBSD.ORG
+MAINTAINER= kuriyama@FreeBSD.org
BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
RUN_DEPENDS= ${PREFIX}/share/java/classes/xml4j.jar:${PORTSDIR}/textproc/xml4j
diff --git a/textproc/nfbtrans/Makefile b/textproc/nfbtrans/Makefile
index 41c979d..393930b 100644
--- a/textproc/nfbtrans/Makefile
+++ b/textproc/nfbtrans/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: nfbtrans
# Version required: 7.50.2
# Date created: 30 Aug 1998
-# Whom: Masafumi NAKANE <max@FreeBSD.ORG>
+# Whom: Masafumi NAKANE <max@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.netcom.com/pub/in/inge/
EXTRACT_SUFX= .zip
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} nfb7502.zip
-MAINTAINER= max@FreeBSD.ORG
+MAINTAINER= max@FreeBSD.org
BROKEN="fetch, nfb7507 is the latest"
diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index 07608a3..aeb0945 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -10,7 +10,7 @@ DISTNAME= jade-1.2.1
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.jclark.com/pub/jade/
-MAINTAINER= jfieber@FreeBSD.ORG
+MAINTAINER= jfieber@FreeBSD.org
.if ${MACHINE_ARCH} == "alpha"
BROKEN= nsgmls coredumps in static constructors
diff --git a/textproc/p5-XML-Parser/Makefile b/textproc/p5-XML-Parser/Makefile
index 3287dfd..e177c1e 100644
--- a/textproc/p5-XML-Parser/Makefile
+++ b/textproc/p5-XML-Parser/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: XML::Parser
# Version required: 2.23
# Date created: 15 Nov 1998
-# Whom: Jun Kuriyama <kuriyama@FreeBSD.ORG>
+# Whom: Jun Kuriyama <kuriyama@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= p5-XML-Parser-2.23
CATEGORIES= textproc perl5
MASTER_SITES= http://wwwx.netheaven.com/~coopercc/xmlparser/
-MAINTAINER= kuriyama@FreeBSD.ORG
+MAINTAINER= kuriyama@FreeBSD.org
USE_PERL5= YES
diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile
index c1cf696..caa5276 100644
--- a/textproc/py-xml/Makefile
+++ b/textproc/py-xml/Makefile
@@ -1,7 +1,7 @@
# Ports collection Makefile for: PyXML
# Version required: 0.5.1
# Date created: 04/17/1999
-# Whom: nectar@FreeBSD.ORG
+# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
@@ -16,7 +16,7 @@ MASTER_SITES= http://www.python.org/sigs/xml-sig/files/ \
http://www.nectar.cc/distfiles/
EXTRACT_SUFX= .tgz
-MAINTAINER= nectar@FreeBSD.ORG
+MAINTAINER= nectar@FreeBSD.org
RUN_DEPENDS= python:${PORTSDIR}/lang/python
diff --git a/textproc/rman/Makefile b/textproc/rman/Makefile
index a7c74f3..c83819e 100644
--- a/textproc/rman/Makefile
+++ b/textproc/rman/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: rman
# Version required: 3.0.7
# Date created: 27 Dec 1994
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= textproc
MASTER_SITES= ftp://ftp.cs.berkeley.edu/ucb/people/phelps/tcltk/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
NO_CDROM= "License required"
MAN1= rman.1
diff --git a/textproc/sgmlformat/Makefile b/textproc/sgmlformat/Makefile
index a2ff1e8..9f7b75a 100644
--- a/textproc/sgmlformat/Makefile
+++ b/textproc/sgmlformat/Makefile
@@ -10,7 +10,7 @@ DISTNAME= sgmlformat-1.7
CATEGORIES= textproc print
MASTER_SITES= http://fallout.campusview.indiana.edu/ports/distfiles/
-MAINTAINER= jfieber@FreeBSD.ORG
+MAINTAINER= jfieber@FreeBSD.org
# There are two ports that satisfy the nsgmls requirement.
# Jade is preferred, but it currently doesn't compile on 2.1.x
diff --git a/textproc/sp/Makefile b/textproc/sp/Makefile
index 97994288..a70d33d 100644
--- a/textproc/sp/Makefile
+++ b/textproc/sp/Makefile
@@ -10,7 +10,7 @@ DISTNAME= sp-1.3
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.jclark.com/pub/sp/
-MAINTAINER= chuckr@FreeBSD.ORG
+MAINTAINER= chuckr@FreeBSD.org
post-patch:
$(CP) $(WRKSRC)/Makefile $(WRKSRC)/Makefile.sed
diff --git a/textproc/tth/Makefile b/textproc/tth/Makefile
index e3f3872..243b3f9 100644
--- a/textproc/tth/Makefile
+++ b/textproc/tth/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: tth
# Version required: 2.22
# Date created: 19 Feb 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.freebsd.org/~tg/ \
http://hutchinson.belmont.ma.us/tth/tth-noncom/
EXTRACT_SUFX= .tgz
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript5 \
ppmtogif:${PORTSDIR}/graphics/netpbm \
diff --git a/textproc/word2x/Makefile b/textproc/word2x/Makefile
index 1cec95e..d8a5a21 100644
--- a/textproc/word2x/Makefile
+++ b/textproc/word2x/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: word2x
# Version required: 0.003
# Date created: 10 June 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
@@ -10,9 +10,9 @@ PKGNAME= word2x-0.003
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.gu.net/pub/unix/viewers/ \
ftp://ftp.afti.nsu.ru/pub/source/utils/word2x/ \
- http://www.FreeBSD.ORG/~billf/
+ http://www.FreeBSD.org/~billf/
-MAINTAINER= billf@FreeBSD.ORG
+MAINTAINER= billf@FreeBSD.org
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/textproc/xml4j/Makefile b/textproc/xml4j/Makefile
index 21a75dc..c7cd95a 100644
--- a/textproc/xml4j/Makefile
+++ b/textproc/xml4j/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: XML for Java
# Version required: 2.0.14
# Date created: 16 May 1999
-# Whom: Jun Kuriyama <kuriyama@FreeBSD.ORG>
+# Whom: Jun Kuriyama <kuriyama@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= xml4j-2.0.14
CATEGORIES= textproc
MASTER_SITES= http://www.alphaworks.ibm.com/tech/xml4j/
-MAINTAINER= kuriyama@FreeBSD.ORG
+MAINTAINER= kuriyama@FreeBSD.org
RUN_DEPENDS= ${PREFIX}/${JFCSUBDIR}/swing.jar:${PORTSDIR}/java/jfc
diff --git a/textproc/xt/Makefile b/textproc/xt/Makefile
index 702e6f3..9f067b5 100644
--- a/textproc/xt/Makefile
+++ b/textproc/xt/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: XT
# Version required: 19990822
# Date created: 23 June 1999
-# Whom: Jun Kuriyama <kuriyama@FreeBSD.ORG>
+# Whom: Jun Kuriyama <kuriyama@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= textproc
MASTER_SITES= ftp://ftp.jclark.com/pub/xml/
EXTRACT_SUFX= .zip
-MAINTAINER= kuriyama@FreeBSD.ORG
+MAINTAINER= kuriyama@FreeBSD.org
BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
RUN_DEPENDS= ${PREFIX}/${JAVASUBDIR}/bin/java:${PORTSDIR}/java/jdk
diff --git a/textproc/yodl/Makefile b/textproc/yodl/Makefile
index fd9c11a..91f0b03 100644
--- a/textproc/yodl/Makefile
+++ b/textproc/yodl/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: yodl
# Version required: 1.22
# Date created: 22 Oct 1997
-# Whom: Donald Burr <dburr@FreeBSD.ORG>
+# Whom: Donald Burr <dburr@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= yodl-1.22
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.icce.rug.nl/pub/unix/
-MAINTAINER= dburr@FreeBSD.ORG
+MAINTAINER= dburr@FreeBSD.org
BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash1 \
latex:${PORTSDIR}/print/latex \
diff --git a/www/arena/Makefile b/www/arena/Makefile
index 98096c0..adb365e 100644
--- a/www/arena/Makefile
+++ b/www/arena/Makefile
@@ -11,7 +11,7 @@ PKGNAME= arena-i18n-beta3b
CATEGORIES= www
MASTER_SITES= ftp://ftp-eu.w3.org/pub/Arena/beta-3/
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg
LIB_DEPENDS+= png.3:${PORTSDIR}/graphics/png
diff --git a/www/ashe/Makefile b/www/ashe/Makefile
index df81527..4c96746 100644
--- a/www/ashe/Makefile
+++ b/www/ashe/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.cs.rpi.edu/pub/puninj/ASHE/ASHE-1.1.2/src/ \
ftp://ftp.cs.rpi.edu/pub/puninj/ASHE/ASHE-1.1.2/libhtmlw/
DISTFILES= ashe_cci.tar.Z cci.tar.Z libhtmlw.tar.Z
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
MAN1= xhtml.1
MANCOMPRESSED= yes
diff --git a/www/bsdi-netscape47-communicator/Makefile b/www/bsdi-netscape47-communicator/Makefile
index 9e00ea4..eb3f558 100644
--- a/www/bsdi-netscape47-communicator/Makefile
+++ b/www/bsdi-netscape47-communicator/Makefile
@@ -9,7 +9,7 @@
MASTER_SITES?= ftp://ftp.netscape.com/pub/communicator/english/4.61/unix/unsupported/freebsd/complete_install/
DISTFILES?= communicator-v461-export.x86-unknown-freebsd.tar.gz
-MAINTAINER?= sada@FreeBSD.ORG
+MAINTAINER?= sada@FreeBSD.org
MASTERDIR= ${.CURDIR}/../netscape4-communicator
NO_LATEST_LINK= yes
diff --git a/www/bsdi-netscape47-navigator/Makefile b/www/bsdi-netscape47-navigator/Makefile
index 2b5adf0..dda7f11 100644
--- a/www/bsdi-netscape47-navigator/Makefile
+++ b/www/bsdi-netscape47-navigator/Makefile
@@ -9,7 +9,7 @@
MASTER_SITES= ftp://ftp.netscape.com/pub/communicator/english/4.61/unix/unsupported/freebsd/navigator_standalone/
DISTFILES= navigator-v461-export.x86-unknown-freebsd.tar.gz
-MAINTAINER?= sada@FreeBSD.ORG
+MAINTAINER?= sada@FreeBSD.org
BROWSER= navigator
INFILE_HEAD= 'Navigator,4.61.0.99147'
diff --git a/www/cgiparse/Makefile b/www/cgiparse/Makefile
index 924a7f9..1d662fa 100644
--- a/www/cgiparse/Makefile
+++ b/www/cgiparse/Makefile
@@ -11,6 +11,6 @@ CATEGORIES= devel
MASTER_SITES= http://resnet.uoregon.edu/~gurney_j/ \
http://d182-89.uoregon.edu/~jmg/
-MAINTAINER= jmg@FreeBSD.ORG
+MAINTAINER= jmg@FreeBSD.org
.include <bsd.port.mk>
diff --git a/www/checkbot/Makefile b/www/checkbot/Makefile
index 2ca9dc5..fc1f0d3 100644
--- a/www/checkbot/Makefile
+++ b/www/checkbot/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= www perl5
MASTER_SITES= http://www.xs4all.nl/~graaff/checkbot/ \
http://www.freebsd.org/~wosch/src/
-MAINTAINER= wosch@FreeBSD.ORG
+MAINTAINER= wosch@FreeBSD.org
site_perl=${PREFIX}/lib/perl5/site_perl/${PERL_VER}
BUILD_DEPENDS= \
diff --git a/www/chimera/Makefile b/www/chimera/Makefile
index b9abb82..17be155 100644
--- a/www/chimera/Makefile
+++ b/www/chimera/Makefile
@@ -10,7 +10,7 @@ DISTNAME= chimera-1.70p0
CATEGORIES= www
MASTER_SITES= ftp://ftp.cs.unlv.edu/pub/chimera/
-MAINTAINER= jseger@FreeBSD.ORG
+MAINTAINER= jseger@FreeBSD.org
BROKEN= build
diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index a73631f..74100f9 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: Coccon
# Version required: 1.3.1
# Date created: 27 June 1999
-# Whom: Jun Kuriyama <kuriyama@FreeBSD.ORG>
+# Whom: Jun Kuriyama <kuriyama@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= textproc www java
MASTER_SITES= http://java.apache.org/cocoon/dist/
EXTRACT_SUFX= .jar
-MAINTAINER= kuriyama@FreeBSD.ORG
+MAINTAINER= kuriyama@FreeBSD.org
RUN_DEPENDS= ${PREFIX}/libexec/apache/mod_jserv.so:${PORTSDIR}/www/apache-jserv
# ${PREFIX}/share/java/classes/lotusxsl.jar:${PORTSDIR}/textproc/lotusxsl
diff --git a/www/grail/Makefile b/www/grail/Makefile
index 4fc4ec2..ab5d579 100644
--- a/www/grail/Makefile
+++ b/www/grail/Makefile
@@ -1,7 +1,7 @@
# Ports collection Makefile for: Grail
# Version required: 0.5
# Date created: 1/11/1999
-# Whom: nectar@FreeBSD.ORG
+# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
diff --git a/www/harvest/Makefile b/www/harvest/Makefile
index 7b09cc4..7f58fd4 100644
--- a/www/harvest/Makefile
+++ b/www/harvest/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.tardis.ed.ac.uk/pub/harvest/ \
http://www3.uniovi.es/~mirror/harvest-net/
EXTRACT_SUFX= -src.tar.gz
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
pre-install:
${MKDIR} ${PREFIX}/harvest
diff --git a/www/htmlpp/Makefile b/www/htmlpp/Makefile
index 712b3d4..05604b5 100644
--- a/www/htmlpp/Makefile
+++ b/www/htmlpp/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: htmlpp
# Version required: 3.9d
# Date created: 9 Nov 1997
-# Whom: Donald Burr <dburr@FreeBSD.ORG>
+# Whom: Donald Burr <dburr@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= www
MASTER_SITES= http://www.imatix.com/pub/tools/
EXTRACT_SUFX= .tgz
-MAINTAINER= dburr@FreeBSD.ORG
+MAINTAINER= dburr@FreeBSD.org
USE_PERL5= YES
diff --git a/www/http-analyze/Makefile b/www/http-analyze/Makefile
index 97d36b0..57bd7fd 100644
--- a/www/http-analyze/Makefile
+++ b/www/http-analyze/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= www
MASTER_SITES= ftp://ftp.rent-a-guru.de/pub/http-analyze2.01/
EXTRACT_SUFX= -src.tar.gz
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/libgd.a:${PORTSDIR}/graphics/gd
diff --git a/www/libghttp/Makefile b/www/libghttp/Makefile
index c3f3659..69ca73f 100644
--- a/www/libghttp/Makefile
+++ b/www/libghttp/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: libghttp
# Version required: 1.0.4
# Date Created: 24 Dec 1998
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/libghttp
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
USE_LIBTOOL= yes
diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index b0c07ac..be028e8 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -11,7 +11,7 @@ PKGNAME= lynx-2.8.3dev.5
CATEGORIES= www
MASTER_SITES= http://sol.slcc.edu/lynx/current/
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
USE_BZIP2= YES
NO_LATEST_LINK= YES
diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index 25731fa..235a8ca 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -11,7 +11,7 @@ PKGNAME= lynx-2.8.2rel.1
CATEGORIES= www
MASTER_SITES= http://sol.slcc.edu/lynx/current/
-MAINTAINER= jseger@FreeBSD.ORG
+MAINTAINER= jseger@FreeBSD.org
USE_BZIP2= YES
WRKSRC= ${WRKDIR}/lynx2-8-2
diff --git a/www/mapedit/Makefile b/www/mapedit/Makefile
index ef667ee..9e81d42 100644
--- a/www/mapedit/Makefile
+++ b/www/mapedit/Makefile
@@ -11,7 +11,7 @@ PKGNAME= mapedit-2.3
CATEGORIES= www
MASTER_SITES= ftp://ftp.boutell.com/pub/boutell/mapedit/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
RUN_DEPENDS= ${PREFIX}/java/bin/java:${PORTSDIR}/java/jdk
diff --git a/www/netscape3/Makefile b/www/netscape3/Makefile
index 20bf746..b92e49e 100644
--- a/www/netscape3/Makefile
+++ b/www/netscape3/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= www
MASTER_SITES?= ftp://archive:oldies@archive.netscape.com/archive/navigator/3.04/shipping/english/unix/bsdi11/navigator_complete/
DISTFILES= netscape-v304-export.x86-unknown-bsd.tar.gz
-MAINTAINER= sada@FreeBSD.ORG
+MAINTAINER= sada@FreeBSD.org
Y2K= http://home.netscape.com/products/year2000/faq/client.html
diff --git a/www/netscape4-communicator.us/Makefile b/www/netscape4-communicator.us/Makefile
index f58f4d5..7d0737c 100644
--- a/www/netscape4-communicator.us/Makefile
+++ b/www/netscape4-communicator.us/Makefile
@@ -11,7 +11,7 @@ DISTNAME= communicator-v407-us.x86-unknown-linux2.0_libc5
PKGNAME= netscape-communicator-4.07.us
CATEGORIES= www
-MAINTAINER= obrien@FreeBSD.ORG
+MAINTAINER= obrien@FreeBSD.org
Y2K= http://home.netscape.com/products/year2000/faq/client.html
diff --git a/www/netscape4-communicator/Makefile b/www/netscape4-communicator/Makefile
index 728b901..bf84073 100644
--- a/www/netscape4-communicator/Makefile
+++ b/www/netscape4-communicator/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= www
MASTER_SITES?= ftp://ftp.netscape.com/pub/communicator/4.08/english/unix/unsupported/freebsd/professional_edition/
DISTFILES?= communicator-v408-export.x86-unknown-freebsd.tar.gz
-MAINTAINER?= sada@FreeBSD.ORG
+MAINTAINER?= sada@FreeBSD.org
Y2K= http://home.netscape.com/products/year2000/faq/client.html
diff --git a/www/netscape4-navigator/Makefile b/www/netscape4-navigator/Makefile
index fbaca8b..22186ed 100644
--- a/www/netscape4-navigator/Makefile
+++ b/www/netscape4-navigator/Makefile
@@ -9,7 +9,7 @@
MASTER_SITES= ftp://ftp.netscape.com/pub/communicator/${BROWSER_VER}/english/unix/unsupported/freebsd/navigator_standalone/
DISTFILES= navigator-v408-export.x86-unknown-freebsd.tar.gz
-MAINTAINER?= sada@FreeBSD.ORG
+MAINTAINER?= sada@FreeBSD.org
MASTERDIR= ${.CURDIR}/../netscape4-communicator
diff --git a/www/netscape47-communicator/Makefile b/www/netscape47-communicator/Makefile
index 9e00ea4..eb3f558 100644
--- a/www/netscape47-communicator/Makefile
+++ b/www/netscape47-communicator/Makefile
@@ -9,7 +9,7 @@
MASTER_SITES?= ftp://ftp.netscape.com/pub/communicator/english/4.61/unix/unsupported/freebsd/complete_install/
DISTFILES?= communicator-v461-export.x86-unknown-freebsd.tar.gz
-MAINTAINER?= sada@FreeBSD.ORG
+MAINTAINER?= sada@FreeBSD.org
MASTERDIR= ${.CURDIR}/../netscape4-communicator
NO_LATEST_LINK= yes
diff --git a/www/netscape47-navigator/Makefile b/www/netscape47-navigator/Makefile
index 2b5adf0..dda7f11 100644
--- a/www/netscape47-navigator/Makefile
+++ b/www/netscape47-navigator/Makefile
@@ -9,7 +9,7 @@
MASTER_SITES= ftp://ftp.netscape.com/pub/communicator/english/4.61/unix/unsupported/freebsd/navigator_standalone/
DISTFILES= navigator-v461-export.x86-unknown-freebsd.tar.gz
-MAINTAINER?= sada@FreeBSD.ORG
+MAINTAINER?= sada@FreeBSD.org
BROWSER= navigator
INFILE_HEAD= 'Navigator,4.61.0.99147'
diff --git a/www/netscape48-communicator/Makefile b/www/netscape48-communicator/Makefile
index 728b901..bf84073 100644
--- a/www/netscape48-communicator/Makefile
+++ b/www/netscape48-communicator/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= www
MASTER_SITES?= ftp://ftp.netscape.com/pub/communicator/4.08/english/unix/unsupported/freebsd/professional_edition/
DISTFILES?= communicator-v408-export.x86-unknown-freebsd.tar.gz
-MAINTAINER?= sada@FreeBSD.ORG
+MAINTAINER?= sada@FreeBSD.org
Y2K= http://home.netscape.com/products/year2000/faq/client.html
diff --git a/www/p5-Apache/Makefile b/www/p5-Apache/Makefile
index 814706e..6ccc17c 100644
--- a/www/p5-Apache/Makefile
+++ b/www/p5-Apache/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Apache
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
BUILD_DEPENDS= /nonexistent:${PORTSDIR}/www/apache13:patch
diff --git a/www/p5-CGI-modules/Makefile b/www/p5-CGI-modules/Makefile
index 4214264..7f4728e 100644
--- a/www/p5-CGI-modules/Makefile
+++ b/www/p5-CGI-modules/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= CGI
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/URI/Escape.pm:${PORTSDIR}/www/p5-libwww
diff --git a/www/p5-CGI/Makefile b/www/p5-CGI/Makefile
index 4214264..7f4728e 100644
--- a/www/p5-CGI/Makefile
+++ b/www/p5-CGI/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= CGI
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/URI/Escape.pm:${PORTSDIR}/www/p5-libwww
diff --git a/www/p5-CGI_Lite/Makefile b/www/p5-CGI_Lite/Makefile
index bf52ab7..322cb4e 100644
--- a/www/p5-CGI_Lite/Makefile
+++ b/www/p5-CGI_Lite/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= CGI_Lite
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/www/p5-HTML-Parser/Makefile b/www/p5-HTML-Parser/Makefile
index dfe8e0c..42afcabd 100644
--- a/www/p5-HTML-Parser/Makefile
+++ b/www/p5-HTML-Parser/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: p5-HTML-Parser
# Version required: 2.*
# Date Created: 28 April 1998
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= HTML
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
USE_PERL5= yes
diff --git a/www/p5-HTML-QuickCheck/Makefile b/www/p5-HTML-QuickCheck/Makefile
index efbe255..049c750 100644
--- a/www/p5-HTML-QuickCheck/Makefile
+++ b/www/p5-HTML-QuickCheck/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= HTML
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/www/p5-HTML-Stream/Makefile b/www/p5-HTML-Stream/Makefile
index 4c31957..182a9e7 100644
--- a/www/p5-HTML-Stream/Makefile
+++ b/www/p5-HTML-Stream/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= HTML
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/www/p5-HTML/Makefile b/www/p5-HTML/Makefile
index fb01a1e..98eacbf 100644
--- a/www/p5-HTML/Makefile
+++ b/www/p5-HTML/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= HTML
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/www/p5-HTTPD-Tools/Makefile b/www/p5-HTTPD-Tools/Makefile
index dbe5e2a..370e53d 100644
--- a/www/p5-HTTPD-Tools/Makefile
+++ b/www/p5-HTTPD-Tools/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= HTTPD
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/www/p5-HTTPD-User-Manage/Makefile b/www/p5-HTTPD-User-Manage/Makefile
index dbe5e2a..370e53d 100644
--- a/www/p5-HTTPD-User-Manage/Makefile
+++ b/www/p5-HTTPD-User-Manage/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= HTTPD
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_PERL5= YES
diff --git a/www/p5-ParallelUA/Makefile b/www/p5-ParallelUA/Makefile
index 1dd10e7..d113e57 100644
--- a/www/p5-ParallelUA/Makefile
+++ b/www/p5-ParallelUA/Makefile
@@ -13,7 +13,7 @@ CATEGORIES= www perl5 devel
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= LWP
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww \
${PREFIX}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI \
diff --git a/www/p5-WWW-Search/Makefile b/www/p5-WWW-Search/Makefile
index cb28467..5cf6e70 100644
--- a/www/p5-WWW-Search/Makefile
+++ b/www/p5-WWW-Search/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: p5-WWW-Search
# Version required: 1.021
# Date created: June 26th 1997
-# Whom: James FitzGibbon <jfitz@FreeBSD.ORG>
+# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= www perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= WWW
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww
diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile
index 9af9102..27d476e 100644
--- a/www/p5-libwww/Makefile
+++ b/www/p5-libwww/Makefile
@@ -13,7 +13,7 @@ CATEGORIES= www perl5 devel
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= LWP
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest.pm:${PORTSDIR}/security/p5-Digest-MD5 \
${PREFIX}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI \
diff --git a/www/py-HTMLgen/Makefile b/www/py-HTMLgen/Makefile
index 13241ff..8ecf024 100644
--- a/www/py-HTMLgen/Makefile
+++ b/www/py-HTMLgen/Makefile
@@ -1,7 +1,7 @@
# Ports collection Makefile for: HTMLgen
# Version required: 2.1
# Date created: 03/20/1999
-# Whom: nectar@FreeBSD.ORG
+# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= www python
MASTER_SITES= http://starship.skyport.net/crew/friedrich/ \
http://www.nectar.cc/distfiles/
-MAINTAINER= nectar@FreeBSD.ORG
+MAINTAINER= nectar@FreeBSD.org
BUILD_DEPENDS= python:${PORTSDIR}/lang/python
RUN_DEPENDS= python:${PORTSDIR}/lang/python
diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index baea64a..f463584 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -10,7 +10,7 @@ DISTNAME= sitecopy-0.6.0
CATEGORIES= www
MASTER_SITES= http://www.lyra.org/sitecopy/
-MAINTAINER= nik@FreeBSD.ORG
+MAINTAINER= nik@FreeBSD.org
FETCH_BEFORE_ARGS= -b
GNU_CONFIGURE= yes
diff --git a/www/snarf/Makefile b/www/snarf/Makefile
index f451b5e..b4d586e 100644
--- a/www/snarf/Makefile
+++ b/www/snarf/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: snarf
# Version required: 2.0.5
# Date created: 2 January 1999
-# Whom: Kris Kennaway <kris@FreeBSD.ORG>
+# Whom: Kris Kennaway <kris@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= snarf-2.0.5
CATEGORIES= www
MASTER_SITES= http://www.xach.com/snarf/
-MAINTAINER= kris@FreeBSD.ORG
+MAINTAINER= kris@FreeBSD.org
GNU_CONFIGURE= yes
diff --git a/www/transproxy/Makefile b/www/transproxy/Makefile
index be1ad19..ece349a 100644
--- a/www/transproxy/Makefile
+++ b/www/transproxy/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= www net
MASTER_SITES= ftp://ftp.nlc.net.au/pub/linux/www/
EXTRACT_SUFX= .tgz
-MAINTAINER= peter@FreeBSD.ORG
+MAINTAINER= peter@FreeBSD.org
ALL_TARGET= tproxy
diff --git a/www/wcol/Makefile b/www/wcol/Makefile
index 2f70163..5ab6f37 100644
--- a/www/wcol/Makefile
+++ b/www/wcol/Makefile
@@ -11,7 +11,7 @@ PKGNAME= wcolEpre-1998.07.13
CATEGORIES= www
MASTER_SITES= http://shika.aist-nara.ac.jp/products/DEST/Wcol/
-MAINTAINER= shige@FreeBSD.ORG
+MAINTAINER= shige@FreeBSD.org
WRKSRC= ${WRKDIR}/${DISTNAME}/src
diff --git a/www/webcopy/Makefile b/www/webcopy/Makefile
index f5192a0..e86dc8b 100644
--- a/www/webcopy/Makefile
+++ b/www/webcopy/Makefile
@@ -13,7 +13,7 @@ CATEGORIES= www
MASTER_SITES= ftp://ftp.inf.utfsm.cl/pub/utfsm/perl/
DISTFILES= webcopy.tgz
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
NO_PACKAGE= "This program cannot be distributed if modified in any way"
NO_CDROM= "Don't sell for profit without written permission"
diff --git a/www/weblint/Makefile b/www/weblint/Makefile
index 9b1c8e8..f77a15a 100644
--- a/www/weblint/Makefile
+++ b/www/weblint/Makefile
@@ -10,7 +10,7 @@ DISTNAME= weblint-1.020
CATEGORIES= www
MASTER_SITES= ftp://ftp.cre.canon.co.uk/pub/weblint/
-MAINTAINER= pst@FreeBSD.ORG
+MAINTAINER= pst@FreeBSD.org
MAN1= weblint.1
diff --git a/www/wwwstat/Makefile b/www/wwwstat/Makefile
index 3bdcbd5..931e099 100644
--- a/www/wwwstat/Makefile
+++ b/www/wwwstat/Makefile
@@ -15,7 +15,7 @@ DISTFILES= wwwstat-2.0.tar.gz
PATCH_SITES= ${MASTER_SITES}
PATCHFILES= patch-2.01.txt
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
RUN_DEPENDS= ${PREFIX}/etc/apache/httpd.conf:${PORTSDIR}/www/apache13
diff --git a/x11-clocks/asclock-gtk/Makefile b/x11-clocks/asclock-gtk/Makefile
index 1f98e6e..d13af29 100644
--- a/x11-clocks/asclock-gtk/Makefile
+++ b/x11-clocks/asclock-gtk/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: asclock-gtk
# Version required: 2.1.10beta
# Date created: 16 March 1998
-# Whom: Jun Kuriyama <kuriyama@FreeBSD.ORG>
+# Whom: Jun Kuriyama <kuriyama@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ PKGNAME= asclock-gtk-beta-2.1.10
CATEGORIES= x11-clocks afterstep windowmaker
MASTER_SITES= http://www.asclock.org/tar/
-MAINTAINER= kuriyama@FreeBSD.ORG
+MAINTAINER= kuriyama@FreeBSD.org
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
diff --git a/x11-clocks/asclock-xlib/Makefile b/x11-clocks/asclock-xlib/Makefile
index 85949b6..22a2a08 100644
--- a/x11-clocks/asclock-xlib/Makefile
+++ b/x11-clocks/asclock-xlib/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: asclock-xlib
# Version required: 2.0.11
# Date created: 24 April 1999
-# Whom: Jun Kuriyama <kuriyama@FreeBSD.ORG>
+# Whom: Jun Kuriyama <kuriyama@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= asclock-xlib-2.0.11
CATEGORIES= x11-clocks afterstep windowmaker
MASTER_SITES= http://www.asclock.org/tar/
-MAINTAINER= kuriyama@FreeBSD.ORG
+MAINTAINER= kuriyama@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/x11-clocks/astime/Makefile b/x11-clocks/astime/Makefile
index 9710874..e9ec64a 100644
--- a/x11-clocks/astime/Makefile
+++ b/x11-clocks/astime/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://bewoner.dma.be/Albert/software/ \
ftp://ftp.tux.org/pub/x/afterstep/apps/astime/ \
ftp://ftp.digex.net/.2/wm/AfterStep/apps/astime/
-MAINTAINER= kris@FreeBSD.ORG
+MAINTAINER= kris@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/x11-clocks/bclock/Makefile b/x11-clocks/bclock/Makefile
index 7214d36..4d6a4d3 100644
--- a/x11-clocks/bclock/Makefile
+++ b/x11-clocks/bclock/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= x11-clocks
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= X11/clocks
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
USE_IMAKE= yes
MAN1= bclock.1
diff --git a/x11-clocks/dclock/Makefile b/x11-clocks/dclock/Makefile
index 96217f9..270091f 100644
--- a/x11-clocks/dclock/Makefile
+++ b/x11-clocks/dclock/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= x11-clocks
MASTER_SITES= ftp://ftp.x.org/R5contrib/
EXTRACT_SUFX= .shar.Z
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
USE_XLIB= yes
MAN1= dclock.1
diff --git a/x11-clocks/wmcalclock/Makefile b/x11-clocks/wmcalclock/Makefile
index 45c1a9e..f08945d 100644
--- a/x11-clocks/wmcalclock/Makefile
+++ b/x11-clocks/wmcalclock/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: wmCalClock
# Version required: 1.25
# Date created: 16 March 1999
-# Whom: Kris Kennaway <kris@FreeBSD.ORG>
+# Whom: Kris Kennaway <kris@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= wmCalClock-1.25
CATEGORIES= x11-clocks windowmaker
MASTER_SITES= http://nis-www.lanl.gov/~mgh/WindowMaker/
-MAINTAINER= kris@FreeBSD.ORG
+MAINTAINER= kris@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm/
diff --git a/x11-clocks/xdaliclock/Makefile b/x11-clocks/xdaliclock/Makefile
index 4a82f3c..c9f949a 100644
--- a/x11-clocks/xdaliclock/Makefile
+++ b/x11-clocks/xdaliclock/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://www.jwz.org/xdaliclock/ \
${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications
-MAINTAINER= gpalmer@FreeBSD.ORG
+MAINTAINER= gpalmer@FreeBSD.org
USE_IMAKE= yes
MAN1= xdaliclock.1
diff --git a/x11-fm/filerunner/Makefile b/x11-fm/filerunner/Makefile
index 4019674..4a15789 100644
--- a/x11-fm/filerunner/Makefile
+++ b/x11-fm/filerunner/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= x11-fm tk81
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= X11/desktop
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= tk81.1:${PORTSDIR}/x11-toolkits/tk81
diff --git a/x11-fm/xfm/Makefile b/x11-fm/xfm/Makefile
index c6aa1be..dbf7c3e 100644
--- a/x11-fm/xfm/Makefile
+++ b/x11-fm/xfm/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= x11-fm
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/x11-fonts/sharefonts/Makefile b/x11-fonts/sharefonts/Makefile
index e4274bf..79917ed 100644
--- a/x11-fonts/sharefonts/Makefile
+++ b/x11-fonts/sharefonts/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: sharefonts
# Version required: 0.10
# Date created: Thu Mar 26 04:50:00 PST 1998
-# Whom: dburr@FreeBSD.ORG
+# Whom: dburr@FreeBSD.org
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= sharefonts-0.10
CATEGORIES= x11-fonts
MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/fonts/
-MAINTAINER= dburr@FreeBSD.ORG
+MAINTAINER= dburr@FreeBSD.org
RESTRICTED= "Shareware. Cannot be distributed w/o prior authorization."
NO_CDROM= ${RESTRICTED}
diff --git a/x11-fonts/ttmkfdir/Makefile b/x11-fonts/ttmkfdir/Makefile
index 7648686..6b5a808 100644
--- a/x11-fonts/ttmkfdir/Makefile
+++ b/x11-fonts/ttmkfdir/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: ttmkfdir
# Version required: 0.0
# Date created: September 08, 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
@@ -10,7 +10,7 @@ PKGNAME= ttmkfdir-0.0
CATEGORIES= x11
MASTER_SITES= http://www.darmstadt.gmd.de/~pommnitz/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= ttf.3:${PORTSDIR}/print/freetype
diff --git a/x11-fonts/xfed/Makefile b/x11-fonts/xfed/Makefile
index 5776988..53001b7 100644
--- a/x11-fonts/xfed/Makefile
+++ b/x11-fonts/xfed/Makefile
@@ -11,7 +11,7 @@ PKGNAME= xfed-1.0
CATEGORIES= x11-fonts
MASTER_SITES= ftp://ftp.demon.co.uk/pub/graphics/systems/X11.old/pub/R6untarred/contrib/programs/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
IGNOREFILES= ${DISTFILES}
USE_IMAKE= yes
diff --git a/x11-fonts/xmbdfed/Makefile b/x11-fonts/xmbdfed/Makefile
index bf58b36..f0522cc 100644
--- a/x11-fonts/xmbdfed/Makefile
+++ b/x11-fonts/xmbdfed/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://crl.nmsu.edu/CLR/multiling/General/
PATCH_SITES= ${MASTER_SITES}
PATCHFILES= xmbdfed-3.9.patch1 xmbdfed-3.9.patch2
-MAINTAINER= jfieber@FreeBSD.ORG
+MAINTAINER= jfieber@FreeBSD.org
.if defined(USE_FREETYPE)
LIB_DEPENDS= ttf.3:${PORTSDIR}/print/freetype
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index 1bfe39b..2ae0e27 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -17,7 +17,7 @@ MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.4/source/ \
DISTFILES= X334src-1.tgz X334src-2.tgz
-MAINTAINER= jmz@FreeBSD.ORG
+MAINTAINER= jmz@FreeBSD.org
IS_INTERACTIVE= yes # configure script asks questions
NO_PACKAGE= package available from XFree86
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index 1bfe39b..2ae0e27 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -17,7 +17,7 @@ MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.4/source/ \
DISTFILES= X334src-1.tgz X334src-2.tgz
-MAINTAINER= jmz@FreeBSD.ORG
+MAINTAINER= jmz@FreeBSD.org
IS_INTERACTIVE= yes # configure script asks questions
NO_PACKAGE= package available from XFree86
diff --git a/x11-themes/gtk-engines/Makefile b/x11-themes/gtk-engines/Makefile
index e1c12dc..fe12bff 100644
--- a/x11-themes/gtk-engines/Makefile
+++ b/x11-themes/gtk-engines/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: gtk-engines
# Version required: 0.5
# Date Created: 23 Dec 1998
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gtk-engines
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= gdk_imlib.4:${PORTSDIR}/graphics/imlib
diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index e1c12dc..fe12bff 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: gtk-engines
# Version required: 0.5
# Date Created: 23 Dec 1998
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gtk-engines
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= gdk_imlib.4:${PORTSDIR}/graphics/imlib
diff --git a/x11-toolkits/Xaw3d/Makefile b/x11-toolkits/Xaw3d/Makefile
index 6c34e83..720de29 100644
--- a/x11-toolkits/Xaw3d/Makefile
+++ b/x11-toolkits/Xaw3d/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= widgets/Xaw3d/R6.3
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
WRKSRC= ${WRKDIR}/xc/lib/Xaw3d
USE_IMAKE= yes
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index 3825abb..e16968a 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: gnustep
# Version required: 0.5.5
# Date created: 03 October 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= devel
MASTER_SITES= ftp://ftp.gnustep.org/pub/gnustep/core/ \
ftp://ftp.peanuts.org/Mirrors/GNUstep/gnustep/core/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff34
diff --git a/x11-toolkits/gnustep-xgps/Makefile b/x11-toolkits/gnustep-xgps/Makefile
index 3825abb..e16968a 100644
--- a/x11-toolkits/gnustep-xgps/Makefile
+++ b/x11-toolkits/gnustep-xgps/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: gnustep
# Version required: 0.5.5
# Date created: 03 October 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ CATEGORIES= devel
MASTER_SITES= ftp://ftp.gnustep.org/pub/gnustep/core/ \
ftp://ftp.peanuts.org/Mirrors/GNUstep/gnustep/core/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff34
diff --git a/x11-toolkits/gtk-engines/Makefile b/x11-toolkits/gtk-engines/Makefile
index e1c12dc..fe12bff 100644
--- a/x11-toolkits/gtk-engines/Makefile
+++ b/x11-toolkits/gtk-engines/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: gtk-engines
# Version required: 0.5
# Date Created: 23 Dec 1998
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gtk-engines
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= gdk_imlib.4:${PORTSDIR}/graphics/imlib
diff --git a/x11-toolkits/gtk-engines2/Makefile b/x11-toolkits/gtk-engines2/Makefile
index e1c12dc..fe12bff 100644
--- a/x11-toolkits/gtk-engines2/Makefile
+++ b/x11-toolkits/gtk-engines2/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: gtk-engines
# Version required: 0.5
# Date Created: 23 Dec 1998
-# Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG>
+# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gtk-engines
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= gdk_imlib.4:${PORTSDIR}/graphics/imlib
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index 31accf1..5ea0008 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
http://www.ameth.org/gimp/gtk/v1.2/
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= glib12.2:${PORTSDIR}/devel/glib12 \
intl.1:${PORTSDIR}/devel/gettext
diff --git a/x11-toolkits/gtk13/Makefile b/x11-toolkits/gtk13/Makefile
index 31accf1..5ea0008 100644
--- a/x11-toolkits/gtk13/Makefile
+++ b/x11-toolkits/gtk13/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
http://www.ameth.org/gimp/gtk/v1.2/
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= glib12.2:${PORTSDIR}/devel/glib12 \
intl.1:${PORTSDIR}/devel/gettext
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 31accf1..5ea0008 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
http://www.ameth.org/gimp/gtk/v1.2/
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= glib12.2:${PORTSDIR}/devel/glib12 \
intl.1:${PORTSDIR}/devel/gettext
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 31accf1..5ea0008 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/v1.2/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
http://www.ameth.org/gimp/gtk/v1.2/
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= glib12.2:${PORTSDIR}/devel/glib12 \
intl.1:${PORTSDIR}/devel/gettext
diff --git a/x11-toolkits/neXtaw/Makefile b/x11-toolkits/neXtaw/Makefile
index a86e8c3..680b723 100644
--- a/x11-toolkits/neXtaw/Makefile
+++ b/x11-toolkits/neXtaw/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: neXtaw
# Version required: 0.5.1
# Date created: 16 January 1997
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= x11-toolkits
MASTER_SITES= http://www.freebsd.org/~tg/
EXTRACT_SUFX= .tar.gz.bin
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
.if ${MACHINE_ARCH} == "alpha"
BROKEN= compiler error in funtion fixup_memory_subreg
diff --git a/x11-toolkits/p5-Gtk/Makefile b/x11-toolkits/p5-Gtk/Makefile
index 4118a05..1614d1d 100644
--- a/x11-toolkits/p5-Gtk/Makefile
+++ b/x11-toolkits/p5-Gtk/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/perl/ \
${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Gtk
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= gdk_imlib.4:${PORTSDIR}/graphics/imlib
diff --git a/x11-toolkits/p5-Tcl-Tk/Makefile b/x11-toolkits/p5-Tcl-Tk/Makefile
index b7f5c16..b08af10 100644
--- a/x11-toolkits/p5-Tcl-Tk/Makefile
+++ b/x11-toolkits/p5-Tcl-Tk/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= x11-toolkits lang perl5 tk80
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Tcl
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/i386-freebsd/Tcl.pm:${PORTSDIR}/lang/p5-Tcl
LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
diff --git a/x11-toolkits/p5-TclTk/Makefile b/x11-toolkits/p5-TclTk/Makefile
index b7f5c16..b08af10 100644
--- a/x11-toolkits/p5-TclTk/Makefile
+++ b/x11-toolkits/p5-TclTk/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= x11-toolkits lang perl5 tk80
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Tcl
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/i386-freebsd/Tcl.pm:${PORTSDIR}/lang/p5-Tcl
LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
diff --git a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile
index 955c7bf..cdf2b6a 100644
--- a/x11-toolkits/p5-Tk/Makefile
+++ b/x11-toolkits/p5-Tk/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= x11-toolkits tk80 perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Tk
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
USE_XLIB= YES
USE_PERL5= YES
diff --git a/x11-toolkits/pmw/Makefile b/x11-toolkits/pmw/Makefile
index ed07bb3..d0eb25d 100644
--- a/x11-toolkits/pmw/Makefile
+++ b/x11-toolkits/pmw/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: pmw
# Version required: 0.8.1
# Date created: 03 June 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
@@ -10,7 +10,7 @@ PKGNAME= py-pmw-0.8.1
CATEGORIES= x11-toolkits python
MASTER_SITES= ftp://ftp.dscpl.com.au/pub/pmw/
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
BUILD_DEPENDS= python:${PORTSDIR}/lang/python
RUN_DEPENDS= python:${PORTSDIR}/lang/python
diff --git a/x11-toolkits/py-Pmw/Makefile b/x11-toolkits/py-Pmw/Makefile
index ed07bb3..d0eb25d 100644
--- a/x11-toolkits/py-Pmw/Makefile
+++ b/x11-toolkits/py-Pmw/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: pmw
# Version required: 0.8.1
# Date created: 03 June 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
@@ -10,7 +10,7 @@ PKGNAME= py-pmw-0.8.1
CATEGORIES= x11-toolkits python
MASTER_SITES= ftp://ftp.dscpl.com.au/pub/pmw/
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
BUILD_DEPENDS= python:${PORTSDIR}/lang/python
RUN_DEPENDS= python:${PORTSDIR}/lang/python
diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile
index 504364d..13ca6b3 100644
--- a/x11-toolkits/py-gnome/Makefile
+++ b/x11-toolkits/py-gnome/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: py-gnome
# Version required: 1.0.1
# Date created: 03/14/1999
-# Whom: nectar@FreeBSD.ORG
+# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.daa.com.au/pub/james/python/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/python/ \
ftp://stef.u-picardie.fr/mirror/ftp.gimp.org/gtk/python/
-MAINTAINER= nectar@FreeBSD.ORG
+MAINTAINER= nectar@FreeBSD.org
BUILD_DEPENDS= python:${PORTSDIR}/lang/python
LIB_DEPENDS= capplet.1:${PORTSDIR}/sysutils/gnomecontrolcenter
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index 504364d..13ca6b3 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: py-gnome
# Version required: 1.0.1
# Date created: 03/14/1999
-# Whom: nectar@FreeBSD.ORG
+# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.daa.com.au/pub/james/python/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/python/ \
ftp://stef.u-picardie.fr/mirror/ftp.gimp.org/gtk/python/
-MAINTAINER= nectar@FreeBSD.ORG
+MAINTAINER= nectar@FreeBSD.org
BUILD_DEPENDS= python:${PORTSDIR}/lang/python
LIB_DEPENDS= capplet.1:${PORTSDIR}/sysutils/gnomecontrolcenter
diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile
index 504364d..13ca6b3 100644
--- a/x11-toolkits/py-gtk/Makefile
+++ b/x11-toolkits/py-gtk/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: py-gnome
# Version required: 1.0.1
# Date created: 03/14/1999
-# Whom: nectar@FreeBSD.ORG
+# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.daa.com.au/pub/james/python/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/python/ \
ftp://stef.u-picardie.fr/mirror/ftp.gimp.org/gtk/python/
-MAINTAINER= nectar@FreeBSD.ORG
+MAINTAINER= nectar@FreeBSD.org
BUILD_DEPENDS= python:${PORTSDIR}/lang/python
LIB_DEPENDS= capplet.1:${PORTSDIR}/sysutils/gnomecontrolcenter
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 504364d..13ca6b3 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: py-gnome
# Version required: 1.0.1
# Date created: 03/14/1999
-# Whom: nectar@FreeBSD.ORG
+# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.daa.com.au/pub/james/python/ \
ftp://ftp.cs.umn.edu/pub/gimp/gtk/python/ \
ftp://stef.u-picardie.fr/mirror/ftp.gimp.org/gtk/python/
-MAINTAINER= nectar@FreeBSD.ORG
+MAINTAINER= nectar@FreeBSD.org
BUILD_DEPENDS= python:${PORTSDIR}/lang/python
LIB_DEPENDS= capplet.1:${PORTSDIR}/sysutils/gnomecontrolcenter
diff --git a/x11-toolkits/qt145/Makefile b/x11-toolkits/qt145/Makefile
index e9ee7cc..be851d0 100644
--- a/x11-toolkits/qt145/Makefile
+++ b/x11-toolkits/qt145/Makefile
@@ -10,7 +10,7 @@ DISTNAME= qt-1.42
CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.troll.no/qt/source/
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
LIB_DEPENDS= MesaGL.14:${PORTSDIR}/graphics/Mesa3
diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile
index e54a259..ec72101 100644
--- a/x11-toolkits/tix/Makefile
+++ b/x11-toolkits/tix/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.neosoft.com/tcl/ftparchive/sorted/devel/ \
ftp://ftp.gwdg.de/pub/x11/tcl/ftp.xpi.com/ \
ftp://ftp.riken.go.jp/pub/lang/tcl/netsoft/sorted/packages-7.6/devel/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
diff --git a/x11-toolkits/tk82/Makefile b/x11-toolkits/tk82/Makefile
index 32cf173..c5c1428 100644
--- a/x11-toolkits/tk82/Makefile
+++ b/x11-toolkits/tk82/Makefile
@@ -11,7 +11,7 @@ PKGNAME= tk-8.1.1
CATEGORIES= x11-toolkits tk81
MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
-MAINTAINER= jseger@FreeBSD.ORG
+MAINTAINER= jseger@FreeBSD.org
LIB_DEPENDS= tcl81.1:${PORTSDIR}/lang/tcl81
FILE_DEPENDS= ${PORTSDIR}/x11-toolkits/tk80
diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile
index 32cf173..c5c1428 100644
--- a/x11-toolkits/tk83/Makefile
+++ b/x11-toolkits/tk83/Makefile
@@ -11,7 +11,7 @@ PKGNAME= tk-8.1.1
CATEGORIES= x11-toolkits tk81
MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
-MAINTAINER= jseger@FreeBSD.ORG
+MAINTAINER= jseger@FreeBSD.org
LIB_DEPENDS= tcl81.1:${PORTSDIR}/lang/tcl81
FILE_DEPENDS= ${PORTSDIR}/x11-toolkits/tk80
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index 32cf173..c5c1428 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -11,7 +11,7 @@ PKGNAME= tk-8.1.1
CATEGORIES= x11-toolkits tk81
MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
-MAINTAINER= jseger@FreeBSD.ORG
+MAINTAINER= jseger@FreeBSD.org
LIB_DEPENDS= tcl81.1:${PORTSDIR}/lang/tcl81
FILE_DEPENDS= ${PORTSDIR}/x11-toolkits/tk80
diff --git a/x11-toolkits/tkstep80/Makefile b/x11-toolkits/tkstep80/Makefile
index 2d433d7..99f576b 100644
--- a/x11-toolkits/tkstep80/Makefile
+++ b/x11-toolkits/tkstep80/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: TkStep
# Version required: 8.0p2
# Date created: 06 November 1997
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_0/
PATCH_SITES= ftp://touchwood.ee.uts.edu.au/pub/TkSTEP/
PATCHFILES= tk8.0.4-to-tkstep8.0.4-2.patch.tar.gz
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
LIB_DEPENDS= tcl80.1:${PORTSDIR}/lang/tcl80 \
Xpm.4:${PORTSDIR}/graphics/xpm \
diff --git a/x11-toolkits/v/Makefile b/x11-toolkits/v/Makefile
index e76bf59..a013f6e 100644
--- a/x11-toolkits/v/Makefile
+++ b/x11-toolkits/v/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: v
# Version required: 1.19
# Date created: 8 Feb 1998
-# Whom: Donald Burr <dburr@FreeBSD.ORG>
+# Whom: Donald Burr <dburr@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= x11-toolkits devel graphics
MASTER_SITES= ftp://ftp.ntua.gr/pub/X11/v/old/ \
ftp://ftp.dl.ac.uk/ccp14/ftp-mirror/programming/objectcentral/old/
-MAINTAINER= dburr@FreeBSD.ORG
+MAINTAINER= dburr@FreeBSD.org
.if ${MACHINE_ARCH} == "alpha"
BROKEN= compiler error in function fixup_memory_subreg
diff --git a/x11-toolkits/xbae/Makefile b/x11-toolkits/xbae/Makefile
index 3483365..22a2e53 100644
--- a/x11-toolkits/xbae/Makefile
+++ b/x11-toolkits/xbae/Makefile
@@ -3,7 +3,7 @@
# Date created: 11 December 96
# Whom: Lars Koeller <Lars_Koeller@odie.physik2.uni-rostock.de>
# With some
-# modifications from: Andreas Klemm <andreas@FreeBSD.ORG>
+# modifications from: Andreas Klemm <andreas@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/x11-toolkits/xview-clients/Makefile b/x11-toolkits/xview-clients/Makefile
index bc2cd7d..8ff028e 100644
--- a/x11-toolkits/xview-clients/Makefile
+++ b/x11-toolkits/xview-clients/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_LOCAL} \
${MASTER_SITE_XCONTRIB}
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
DEPENDS= ${PORTSDIR}/x11-toolkits/xview:install
diff --git a/x11-toolkits/xview/Makefile b/x11-toolkits/xview/Makefile
index 2edb9f3..37a5991 100644
--- a/x11-toolkits/xview/Makefile
+++ b/x11-toolkits/xview/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} \
${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= libraries
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
USE_IMAKE= yes
IMAKEINCLUDE= "-I${X11BASE}/lib/X11/config -I${WRKSRC}/config"
diff --git a/x11-wm/afterstep-i18n/Makefile b/x11-wm/afterstep-i18n/Makefile
index 711c160..91b9e17 100644
--- a/x11-wm/afterstep-i18n/Makefile
+++ b/x11-wm/afterstep-i18n/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: afterstep-i18n
# Version required: 1.0
# Date created: 23 October 1998
-# Whom: issei@jp.FreeBSD.ORG
+# Whom: issei@jp.FreeBSD.org
#
# $FreeBSD$
#
@@ -20,7 +20,7 @@ DISTFILES= ${DISTNAME}.tar.gz \
PATCH_DIST_STRIP= -p1
-MAINTAINER= issei@jp.FreeBSD.ORG
+MAINTAINER= issei@jp.FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile
index 2d38307..86d5131 100644
--- a/x11-wm/afterstep/Makefile
+++ b/x11-wm/afterstep/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: afterstep
# Version required: 1.0
# Date created: October 29th 1996
-# Whom: jfitz@FreeBSD.ORG
+# Whom: jfitz@FreeBSD.org
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITES= ${MASTER_SITE_AFTERSTEP} \
ftp://ftp.cs.tu-berlin.de/pub/X/afterstep/
MASTER_SITE_SUBDIR= stable/archives
-MAINTAINER= jfitz@FreeBSD.ORG
+MAINTAINER= jfitz@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile
index 891343b..4763b24 100644
--- a/x11-wm/ctwm/Makefile
+++ b/x11-wm/ctwm/Makefile
@@ -15,7 +15,7 @@ PATCH_SITES= ${MASTER_SITES}
PATCHFILES= ctwm-3.5-3.5.1.diffs.gz
PATCH_DIST_STRIP= -p1
-MAINTAINER= torstenb@FreeBSD.ORG
+MAINTAINER= torstenb@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index 6b97428..0d723a3 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://www.rasterman.com/pub/enlightenment/enlightenment/ \
http://www.rasterman.com/files/ \
ftp://ftp.dti.ad.jp/pub/X/enlightenment/enlightenment/
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= esd.1:${PORTSDIR}/audio/esound \
Fnlib.0:${PORTSDIR}/graphics/fnlib \
diff --git a/x11-wm/enlightenment-devel/Makefile b/x11-wm/enlightenment-devel/Makefile
index 6b97428..0d723a3 100644
--- a/x11-wm/enlightenment-devel/Makefile
+++ b/x11-wm/enlightenment-devel/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://www.rasterman.com/pub/enlightenment/enlightenment/ \
http://www.rasterman.com/files/ \
ftp://ftp.dti.ad.jp/pub/X/enlightenment/enlightenment/
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= esd.1:${PORTSDIR}/audio/esound \
Fnlib.0:${PORTSDIR}/graphics/fnlib \
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index 6b97428..0d723a3 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://www.rasterman.com/pub/enlightenment/enlightenment/ \
http://www.rasterman.com/files/ \
ftp://ftp.dti.ad.jp/pub/X/enlightenment/enlightenment/
-MAINTAINER= vanilla@FreeBSD.ORG
+MAINTAINER= vanilla@FreeBSD.org
LIB_DEPENDS= esd.1:${PORTSDIR}/audio/esound \
Fnlib.0:${PORTSDIR}/graphics/fnlib \
diff --git a/x11-wm/fvwm95/Makefile b/x11-wm/fvwm95/Makefile
index feda05f..dd1d6e5 100644
--- a/x11-wm/fvwm95/Makefile
+++ b/x11-wm/fvwm95/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= x11-wm
MASTER_SITES= ftp://mitac11.uia.ac.be/pub/fvwm95/
EXTRACT_SUFX= .tgz
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
BUILD_DEPENDS= ${LOCALBASE}/lib/librplay.a:${PORTSDIR}/audio/rplay
diff --git a/x11-wm/gwm/Makefile b/x11-wm/gwm/Makefile
index 1a3a2c9..3e0898f2 100644
--- a/x11-wm/gwm/Makefile
+++ b/x11-wm/gwm/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= window_managers/gwm
-MAINTAINER= markm@FreeBSD.ORG
+MAINTAINER= markm@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/x11-wm/piewm/Makefile b/x11-wm/piewm/Makefile
index 152bc70..ea495de 100644
--- a/x11-wm/piewm/Makefile
+++ b/x11-wm/piewm/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.x.org/R5contrib/
EXTRACT_SUFX= .tar.Z
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/x11-wm/tvtwm/Makefile b/x11-wm/tvtwm/Makefile
index f452628..c579fb3 100644
--- a/x11-wm/tvtwm/Makefile
+++ b/x11-wm/tvtwm/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= window_managers
-MAINTAINER= gpalmer@FreeBSD.ORG
+MAINTAINER= gpalmer@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index 1bfe39b..2ae0e27 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -17,7 +17,7 @@ MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.4/source/ \
DISTFILES= X334src-1.tgz X334src-2.tgz
-MAINTAINER= jmz@FreeBSD.ORG
+MAINTAINER= jmz@FreeBSD.org
IS_INTERACTIVE= yes # configure script asks questions
NO_PACKAGE= package available from XFree86
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index 1bfe39b..2ae0e27 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -17,7 +17,7 @@ MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.4/source/ \
DISTFILES= X334src-1.tgz X334src-2.tgz
-MAINTAINER= jmz@FreeBSD.ORG
+MAINTAINER= jmz@FreeBSD.org
IS_INTERACTIVE= yes # configure script asks questions
NO_PACKAGE= package available from XFree86
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index 1bfe39b..2ae0e27 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@@ -17,7 +17,7 @@ MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.4/source/ \
DISTFILES= X334src-1.tgz X334src-2.tgz
-MAINTAINER= jmz@FreeBSD.ORG
+MAINTAINER= jmz@FreeBSD.org
IS_INTERACTIVE= yes # configure script asks questions
NO_PACKAGE= package available from XFree86
diff --git a/x11/XFree86-contrib/Makefile b/x11/XFree86-contrib/Makefile
index 71d8ac7..57dbaf0 100644
--- a/x11/XFree86-contrib/Makefile
+++ b/x11/XFree86-contrib/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.3/source/ \
ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.3/source/
EXTRACT_SUFX= .tgz
-MAINTAINER= jmz@FreeBSD.ORG
+MAINTAINER= jmz@FreeBSD.org
# Define FORCE_PACKAGE from the command line if you want to override
# this and build a package
diff --git a/x11/XFree86/Makefile b/x11/XFree86/Makefile
index 1bfe39b..2ae0e27 100644
--- a/x11/XFree86/Makefile
+++ b/x11/XFree86/Makefile
@@ -17,7 +17,7 @@ MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/3.3.4/source/ \
DISTFILES= X334src-1.tgz X334src-2.tgz
-MAINTAINER= jmz@FreeBSD.ORG
+MAINTAINER= jmz@FreeBSD.org
IS_INTERACTIVE= yes # configure script asks questions
NO_PACKAGE= package available from XFree86
diff --git a/x11/fbsd-icons/Makefile b/x11/fbsd-icons/Makefile
index 980d9d3..3fe47ef 100644
--- a/x11/fbsd-icons/Makefile
+++ b/x11/fbsd-icons/Makefile
@@ -11,7 +11,7 @@ PKGNAME= fbsd-icons-1.0
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
-MAINTAINER= andreas@FreeBSD.ORG
+MAINTAINER= andreas@FreeBSD.org
USE_X_PREFIX= yes
NO_BUILD= yes
diff --git a/x11/kb2mb2/Makefile b/x11/kb2mb2/Makefile
index cd04d3c..65ae96c 100644
--- a/x11/kb2mb2/Makefile
+++ b/x11/kb2mb2/Makefile
@@ -10,7 +10,7 @@ DISTNAME= kb2mb2-1.0
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_PORTS_JP}
-MAINTAINER= sada@FreeBSD.ORG
+MAINTAINER= sada@FreeBSD.org
USE_IMAKE= yes
NO_INSTALL_MANPAGES= yes
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 20bca74..4fad7a6 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: wdm
# Version required: 1.0
# Date created: August 31, 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.windowmaker.org/pub/contrib/srcs/utils/ \
http://www.de.freebsd.org/de/gif/bsd/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DAEMONPIC}
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
gif.3:${PORTSDIR}/graphics/giflib \
diff --git a/x11/xbanner/Makefile b/x11/xbanner/Makefile
index 5879a03..6a23ec6 100644
--- a/x11/xbanner/Makefile
+++ b/x11/xbanner/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://physics.fullerton.edu/pub/Linux/XBanner/ \
${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR=X11/xutils
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/x11/xcolors/Makefile b/x11/xcolors/Makefile
index 0fd0e10..ab3df5d 100644
--- a/x11/xcolors/Makefile
+++ b/x11/xcolors/Makefile
@@ -11,7 +11,7 @@ PKGNAME= xcolors-1.3
CATEGORIES= x11
MASTER_SITES= ftp://ftp.tut.ac.jp/X11/X11R6/contrib/programs/
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
WRKSRC= ${WRKDIR}/xcolors
USE_IMAKE= yes
diff --git a/x11/xdtm/Makefile b/x11/xdtm/Makefile
index caf8c21..848a3b2 100644
--- a/x11/xdtm/Makefile
+++ b/x11/xdtm/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications
-MAINTAINER= gpalmer@FreeBSD.ORG
+MAINTAINER= gpalmer@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/x11/xfedor/Makefile b/x11/xfedor/Makefile
index 28760e1..a7690d9 100644
--- a/x11/xfedor/Makefile
+++ b/x11/xfedor/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES= ftp://ftp.kiarchive.ru/pub/x11/util/
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
-MAINTAINER= ache@FreeBSD.ORG
+MAINTAINER= ache@FreeBSD.org
USE_IMAKE= yes
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index 9299e7be..23f5970 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/ \
${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index d6ab4de..10bcbfc 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -10,7 +10,7 @@ DISTNAME= xscreensaver-3.17
CATEGORIES= x11
MASTER_SITES= http://www.jwz.org/xscreensaver/
-MAINTAINER= jseger@FreeBSD.ORG
+MAINTAINER= jseger@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm
diff --git a/x11/xtattr/Makefile b/x11/xtattr/Makefile
index 9e19de9..c4902e0 100644
--- a/x11/xtattr/Makefile
+++ b/x11/xtattr/Makefile
@@ -10,7 +10,7 @@ DISTNAME= xtattr-1.0
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
-MAINTAINER= ports@FreeBSD.ORG
+MAINTAINER= ports@FreeBSD.org
USE_IMAKE= yes
MAN1= xtattr.1
diff --git a/x11/xwit/Makefile b/x11/xwit/Makefile
index f4a104a..d6a0942 100644
--- a/x11/xwit/Makefile
+++ b/x11/xwit/Makefile
@@ -1,7 +1,7 @@
# New ports collection makefile for: xwit
# Version required: 1.0
# Date created: 15 June 1998
-# Whom: Thomas Gellekum <tg@FreeBSD.ORG>
+# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTNAME= xwit-1.0
CATEGORIES= x11
MASTER_SITES= http://www.freebsd.org/~tg/
-MAINTAINER= tg@FreeBSD.ORG
+MAINTAINER= tg@FreeBSD.org
USE_IMAKE= yes
MAN1= xwit.1
OpenPOWER on IntegriCloud