To ports@freebsd.org.

42 files changed, 50 insertions, 46 deletions

diff --git a/benchmarks/iozone21/Makefile b/benchmarks/iozone21/Makefile
index 1ee754f910d..86bc90c2509 100644
--- a/benchmarks/iozone21/Makefile
+++ b/benchmarks/iozone21/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	benchmarks
 MASTER_SITES=	ftp://ftp.cs.uni-sb.de/pub/others/
 EXTRACT_SUFX=	.shar.gz
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 LATEST_LINK=	iozone21
 
diff --git a/comms/lrzsz/Makefile b/comms/lrzsz/Makefile
index 73715191821..b459568c75c 100644
--- a/comms/lrzsz/Makefile
+++ b/comms/lrzsz/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	comms
 MASTER_SITES=	http://www.ohse.de/uwe/releases/  \
 		http://www.netsw.org/net/modem/protocols/zmodem/lrzsz/
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 GNU_CONFIGURE=	yes
 ALL_TARGET=	all # vcheck
diff --git a/comms/zmtx-zmrx/Makefile b/comms/zmtx-zmrx/Makefile
index 2e9ff676331..d6182b40735 100644
--- a/comms/zmtx-zmrx/Makefile
+++ b/comms/zmtx-zmrx/Makefile
@@ -16,7 +16,7 @@ MASTER_SITES=	ftp://ftp.inria.fr/network/modem/  \
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.shar.gz
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 EXTRACT_CMD=	zcat
 EXTRACT_BEFORE_ARGS=
diff --git a/devel/cdecl/Makefile b/devel/cdecl/Makefile
index 0aa5638088a..ea360abb6f2 100644
--- a/devel/cdecl/Makefile
+++ b/devel/cdecl/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	ftp://ftp.netsw.org/softeng/lang/c/tools/cdecl/  \
 		ftp://ftp.bitcon.no//pub/linux/linuxberg/files/console/dev/  \
 		ftp://ftp.uakom.sk/pub/linux/devel/lang/c/
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 ALL_TARGET=
 MAN1=		cdecl.1
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index 6cabede2c4b..98e6cb91a24 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR= ddd
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
diff --git a/devel/libgnugetopt/Makefile b/devel/libgnugetopt/Makefile
index f11b0368380..8e2cc491ff2 100644
--- a/devel/libgnugetopt/Makefile
+++ b/devel/libgnugetopt/Makefile
@@ -9,7 +9,7 @@
 #	Note that GCC contains the master copy of GNU's getopt in libiberty/
 #	and include/.  The next time this port is updated, it should use
 #	the latest GCC release (the smaller -core dist is fine) for the
-#	distfile.	-- obrien
+#	distfile.	-- David O'Brien <obrien@FreeBSD.org>
 
 PORTNAME=	libgnugetopt
 PORTVERSION=	1.1
@@ -17,7 +17,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	obrien
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 INSTALLS_SHLIB=	yes
 
diff --git a/devel/libgnugetopt/distinfo b/devel/libgnugetopt/distinfo
index 568bfe02ffa..f38a77ec413 100644
--- a/devel/libgnugetopt/distinfo
+++ b/devel/libgnugetopt/distinfo
@@ -1 +1 @@
-MD5 (libgnugetopt-1.1.tar.gz) = 9b891a8b17a05448cddb134118d83281
+MD5 (gengetopt-2.4.tar.gz) = 452505146fa9a7075af6cecd99270097
diff --git a/devel/libmalloc/Makefile b/devel/libmalloc/Makefile
index 7827826cb7c..bc4085ed7a8 100644
--- a/devel/libmalloc/Makefile
+++ b/devel/libmalloc/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.cs.toronto.edu/pub/moraes/
 DISTNAME=	malloc-${PORTVERSION}
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 BROKEN=		"Installs malloc.h, masking system version"
 
diff --git a/devel/libshhmsg/Makefile b/devel/libshhmsg/Makefile
index 5aa1dd2e6c7..28747597bbe 100644
--- a/devel/libshhmsg/Makefile
+++ b/devel/libshhmsg/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel
 MASTER_SITES=	http://shh.thathost.com/pub-unix/files/
 DISTNAME=	shhmsg-${PORTVERSION}
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/devel/libshhopt/Makefile b/devel/libshhopt/Makefile
index 61f6d5736a2..fee2462e024 100644
--- a/devel/libshhopt/Makefile
+++ b/devel/libshhopt/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel
 MASTER_SITES=	http://shh.thathost.com/pub-unix/files/
 DISTNAME=	shhopt-${PORTVERSION}
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/devel/libxalloc/Makefile b/devel/libxalloc/Makefile
index 55d4c050714..68806a3d3e5 100644
--- a/devel/libxalloc/Makefile
+++ b/devel/libxalloc/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel
 MASTER_SITES=	http://shh.thathost.com/pub-unix/files/
 DISTNAME=	xalloc-${PORTVERSION}
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/devel/mprof/Makefile b/devel/mprof/Makefile
index e0fdf921e6c..a584a7ab22c 100644
--- a/devel/mprof/Makefile
+++ b/devel/mprof/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.cs.colorado.edu/pub/misc/
 EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 NO_WRKSUBDIR=	yes
 MAKEFILE=	Makefile.i386
diff --git a/devel/sfio/Makefile b/devel/sfio/Makefile
index 416be3efe8b..10a5c1d940e 100644
--- a/devel/sfio/Makefile
+++ b/devel/sfio/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_NETBSD}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 EXTRACT_SUFX=	.src.unix.cpio
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 EXTRACT_CMD=	cpio
 EXTRACT_BEFORE_ARGS=	-idF
diff --git a/devel/ups-debug/Makefile b/devel/ups-debug/Makefile
index 2d48f7657d8..80e8ec10d5d 100644
--- a/devel/ups-debug/Makefile
+++ b/devel/ups-debug/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	${MASTER_SITE_XCONTRIB}  \
 MASTER_SITE_SUBDIR= utilities
 DISTNAME=	ups-3.35-beta13
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 GNU_CONFIGURE=	yes
 USE_XLIB=	yes
diff --git a/devel/xwpe/Makefile b/devel/xwpe/Makefile
index 562f3ed58f5..1a120b4c4c4 100644
--- a/devel/xwpe/Makefile
+++ b/devel/xwpe/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		ftp://ftp.identicalsoftware.com/pub/linux/xwpe/
 MASTER_SITE_SUBDIR=	apps/editors/X
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 # LD_LIBRARY_PATH is to deal with a braindead libX11.a search in configure
 # (once again author assumes too many Linux'isms)
diff --git a/editors/sted/Makefile b/editors/sted/Makefile
index ffc6e194ffd..e6eaa61cfad 100644
--- a/editors/sted/Makefile
+++ b/editors/sted/Makefile
@@ -11,7 +11,7 @@ PORTVERSION=	0.2.2
 CATEGORIES=	editors
 MASTER_SITES=	http://user.tninet.se/~uxm165t/
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/sted
 
diff --git a/games/xbill/Makefile b/games/xbill/Makefile
index f6cdded4972..e4f9c04d6bf 100644
--- a/games/xbill/Makefile
+++ b/games/xbill/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 USE_IMAKE=	yes
 USE_XPM=	yes
diff --git a/lang/Sather/Makefile b/lang/Sather/Makefile
index 138134c1ae3..22a54c0fa79 100644
--- a/lang/Sather/Makefile
+++ b/lang/Sather/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	sather
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libgc.a:${PORTSDIR}/devel/boehm-gc
 
diff --git a/lang/mawk/Makefile b/lang/mawk/Makefile
index 2eb294d1ba5..c8f181def48 100644
--- a/lang/mawk/Makefile
+++ b/lang/mawk/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.whidbey.net/pub/brennan/
 DISTFILES=	${PORTNAME}${PORTVERSION}.tar.gz
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 GNU_CONFIGURE=	yes
 ALL_TARGET=
diff --git a/lang/mixal/Makefile b/lang/mixal/Makefile
index 36adc1e7f80..5890b479db3 100644
--- a/lang/mixal/Makefile
+++ b/lang/mixal/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.ccil.org/retro/  \
 		ftp://locke.ccil.org/pub/retro/
 EXTRACT_SUFX=	.shar.gz
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 EXTRACT_CMD=	zcat
 EXTRACT_BEFORE_ARGS=
diff --git a/mail/muttzilla/Makefile b/mail/muttzilla/Makefile
index 4576012eabe..d7944169133 100644
--- a/mail/muttzilla/Makefile
+++ b/mail/muttzilla/Makefile
@@ -11,7 +11,7 @@ PORTVERSION=	0.40
 CATEGORIES=	mail www
 MASTER_SITES=	http://www3.bc.sympatico.ca/brian_winters/mutt/
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 pre-configure:
 	@${PERL} -pi.orig \
diff --git a/net-mgmt/wide-dhcp/Makefile b/net-mgmt/wide-dhcp/Makefile
index 797b8213ff4..8c8fe785b2b 100644
--- a/net-mgmt/wide-dhcp/Makefile
+++ b/net-mgmt/wide-dhcp/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	ftp://sh.wide.ad.jp/WIDE/free-ware/dhcp/ \
 		ftp://ftp.sage-au.org.au/pub/network/boot/wide-dhcp/
 DISTNAME=	dhcp-1.4.0p6
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 MAKE_ENV=	OSTYPE=${OPSYS}
 
diff --git a/net/bounce/Makefile b/net/bounce/Makefile
index d42bc68a793..ff41a0fb513 100644
--- a/net/bounce/Makefile
+++ b/net/bounce/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	obrien
 DISTNAME=	bounce
 EXTRACT_SUFX=	.c
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 NO_WRKSUBDIR=	yes
 
diff --git a/net/icmpinfo/Makefile b/net/icmpinfo/Makefile
index 1021d72657b..b3645700499 100644
--- a/net/icmpinfo/Makefile
+++ b/net/icmpinfo/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://hplyot.obspm.fr/net/ \
 		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	system/network/admin
 
-MAINTAINER=	obrien@NUXI.com
+MAINTAINER=	ports@NUXI.com
 
 ALL_TARGET=
 MAN1=		icmpinfo.1
diff --git a/net/queso/Makefile b/net/queso/Makefile
index 31f2a083ada..3be7d4ff9ae 100644
--- a/net/queso/Makefile
+++ b/net/queso/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://freebsd.ntu.edu.tw/FreeBSD/distfiles/  \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	obrien
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 GNU_CONFIGURE=  yes
 
diff --git a/net/relay/Makefile b/net/relay/Makefile
index c8d2946b53e..6a7c661c97a 100644
--- a/net/relay/Makefile
+++ b/net/relay/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.iagora.com/~espel/  \
 MASTER_SITE_SUBDIR=	obrien
 DISTNAME=	relay
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 IS_INTERACTIVE=	'must set server hostname in relay.h'
 
diff --git a/net/smbtcpdump/Makefile b/net/smbtcpdump/Makefile
index 984c3895b74..210c9bdd189 100644
--- a/net/smbtcpdump/Makefile
+++ b/net/smbtcpdump/Makefile
@@ -17,7 +17,7 @@ EXTRACT_SUFX=	.tar.Z
 PATCH_SITES=	ftp://ftp.samba.org/pub/samba/tcpdump-smb/
 PATCHFILES=	tcpdump-3.4a5-smb.patch
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 GNU_CONFIGURE=	yes
 ALL_TARGET=	depend tcpdump
diff --git a/net/telserv/Makefile b/net/telserv/Makefile
index 562927c517f..ae96d1410ab 100644
--- a/net/telserv/Makefile
+++ b/net/telserv/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	obrien
 DISTNAME=	telserv
 EXTRACT_SUFX=	.c
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 NO_WRKSUBDIR=	yes
 
diff --git a/net/wide-dhcp/Makefile b/net/wide-dhcp/Makefile
index 797b8213ff4..8c8fe785b2b 100644
--- a/net/wide-dhcp/Makefile
+++ b/net/wide-dhcp/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	ftp://sh.wide.ad.jp/WIDE/free-ware/dhcp/ \
 		ftp://ftp.sage-au.org.au/pub/network/boot/wide-dhcp/
 DISTNAME=	dhcp-1.4.0p6
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 MAKE_ENV=	OSTYPE=${OPSYS}
 
diff --git a/print/bibcard/Makefile b/print/bibcard/Makefile
index 81a90afdd5d..6f7822b9bc8 100644
--- a/print/bibcard/Makefile
+++ b/print/bibcard/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://crl.nmsu.edu/pub/misc/
 DISTNAME=	bibcard.6.4
 EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	obrien@NUXI.com
+MAINTAINER=	ports@NUXI.com
 
 LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview
 
diff --git a/print/detex/Makefile b/print/detex/Makefile
index b1a2efee215..fe9d416ed19 100644
--- a/print/detex/Makefile
+++ b/print/detex/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.cs.purdue.edu/pub/trinkle/
 EXTRACT_SUFX=	.tar
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 EXTRACT_CMD=		${TAR}
 EXTRACT_BEFORE_ARGS=	-xf
diff --git a/print/gv/Makefile b/print/gv/Makefile
index 24c2916cd88..68573f0b5ea 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftpthep.physik.uni-mainz.de/pub/gv/unix/  \
 		${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	support/ghostscript/gnu/gv/unix
 
-MAINTAINER=	obrien@freebsd.org
+MAINTAINER=	ports@freebsd.org
 
 LIB_DEPENDS=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
 
diff --git a/print/lprps-letter/Makefile b/print/lprps-letter/Makefile
index a2296a4249c..b6b42a9bca0 100644
--- a/print/lprps-letter/Makefile
+++ b/print/lprps-letter/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.jclark.com/pub/lprps/
 DISTNAME=	lprps-2.5
 EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 MAKE_FLAGS?=	PAPERSIZE=${PS} -f
 MAN1=		psrev.1 textps.1
diff --git a/shells/bash1/Makefile b/shells/bash1/Makefile
index fc54edcaa05..6750353d4e4 100644
--- a/shells/bash1/Makefile
+++ b/shells/bash1/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	shells
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	bash
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 NO_LATEST_LINK=	yes
 WRKSRC=	${WRKDIR}/${DISTNAME}
diff --git a/sysutils/ltrace/Makefile b/sysutils/ltrace/Makefile
index e89013c1ae1..a7f6c286f95 100644
--- a/sysutils/ltrace/Makefile
+++ b/sysutils/ltrace/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	sysutils
 MASTER_SITES=	http://utopia.knoware.nl/users/driehuis/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-fbsd
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile
index bdd3158acf2..71ea032b42a 100644
--- a/sysutils/xosview/Makefile
+++ b/sysutils/xosview/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	\
 		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	system/status/xstatus
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
diff --git a/sysutils/xsysstats/Makefile b/sysutils/xsysstats/Makefile
index 8d612c6ddf5..d8e6216aaa5 100644
--- a/sysutils/xsysstats/Makefile
+++ b/sysutils/xsysstats/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	utilities
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 USE_IMAKE=	yes
 MAN1=		xsysstats.1
diff --git a/textproc/agrep/Makefile b/textproc/agrep/Makefile
index b72737c19ff..8ea655baebc 100644
--- a/textproc/agrep/Makefile
+++ b/textproc/agrep/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.cs.arizona.edu/agrep/
 EXTRACT_SUFX=	.tar.Z
 #DISTFILES=	${DISTNAME}.${EXTRACT_SUFX} agrep.ps.1.Z  agrep.ps.2.Z
 
-MAINTAINER=	obrien@NUXI.com
+MAINTAINER=	ports@FreeBSD.org
 
 ALL_TARGET=
 MAN1=		agrep.1
diff --git a/textproc/dict/Makefile b/textproc/dict/Makefile
index d082f2d4b95..1699e3bcf54 100644
--- a/textproc/dict/Makefile
+++ b/textproc/dict/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.cs.unc.edu/pub/users/faith/dict/ \
 		ftp://ftp.dict.org/pub/dict/
 DISTNAME=	${PORTNAME}d-${PORTVERSION}
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-local-zlib --with-cflags="${CFLAGS}" \
diff --git a/www/netscape4-communicator.us/Makefile b/www/netscape4-communicator.us/Makefile
index 598b02db109..f1a2f48af9c 100644
--- a/www/netscape4-communicator.us/Makefile
+++ b/www/netscape4-communicator.us/Makefile
@@ -11,7 +11,7 @@ PORTVERSION=	4.07.us
 CATEGORIES=	www linux
 DISTNAME=	communicator-v407-us.x86-unknown-linux2.0_libc5
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 RUN_DEPENDS=	/compat/linux/lib/ld-linux.so.1:${PORTSDIR}/emulators/linux_base
 
diff --git a/x11-clocks/rclock/Makefile b/x11-clocks/rclock/Makefile
index f1e93891118..ae34476d0a1 100644
--- a/x11-clocks/rclock/Makefile
+++ b/x11-clocks/rclock/Makefile
@@ -5,6 +5,10 @@
 #
 # $FreeBSD$
 #
+# If possible, please consider updating the simple ports/x11/rxvt
+# (and maybe ports/chinese/rxvt) when you upgrade rxvt.  These ports all use
+# the same distfile.
+#
 
 PORTNAME=	rclock
 PORTVERSION=	2.7.3
@@ -15,7 +19,7 @@ MASTER_SITES=	ftp://ftp.rxvt.org/pub/rxvt/  \
 MASTER_SITE_SUBDIR=	X11/terms
 DISTNAME=	rxvt-${PORTVERSION}
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 CFLAGS+=	-DMAIL_SPOOL='\"/var/mail/\"'
 USE_BZIP2=	yes
diff --git a/x11-toolkits/open-motif-devel/Makefile b/x11-toolkits/open-motif-devel/Makefile
index 2c534000c29..16cd4919b8c 100644
--- a/x11-toolkits/open-motif-devel/Makefile
+++ b/x11-toolkits/open-motif-devel/Makefile
@@ -7,16 +7,16 @@
 #
 
 PORTNAME=	open-motif-devel
-PORTVERSION=	2.1.30
+PORTVERSION=	2.2.1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	ftp://openmotif.opengroup.org/pub/openmotif/R2.1.30/binaries/metrolink/  \
-		ftp://ftp.opengroup.org/pub/openmotif/R2.1.30/binaries/metrolink/  \
+MASTER_SITES=	ftp://openmotif.opengroup.org/pub/openmotif/R2.2.1/binaries/metrolink/  \
+		ftp://ftp.opengroup.org/pub/openmotif/R2.2.1/binaries/metrolink/  \
 		ftp://ftp.isca.uiowa.edu/pub/mirrors/openmotif/binaries/metrolink/  \
 		ftp://ftp.kddlabs.co.jp:/X11/openmotif/binaries/metrolink/
 DISTNAME=	openmotif-devel-${PORTVERSION}-4_MLI
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	obrien@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
 ONLY_FOR_ARCHS=	i386
 PREFIX?=	/	# will install into ${PREFIX}/usr/X11R6