aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormm <mm@FreeBSD.org>2007-04-05 21:19:09 +0800
committermm <mm@FreeBSD.org>2007-04-05 21:19:09 +0800
commit3cb7e366ed35da4d8298e8815ec5b072951a61b5 (patch)
tree6260025b6835b982d919eb71e5065bb6ea7067bc
parentadaa1777eada4d74e23dfc6fef9a9c91cb97eb94 (diff)
downloadfreebsd-ports-gnome-3cb7e366ed35da4d8298e8815ec5b072951a61b5.tar.gz
freebsd-ports-gnome-3cb7e366ed35da4d8298e8815ec5b072951a61b5.tar.zst
freebsd-ports-gnome-3cb7e366ed35da4d8298e8815ec5b072951a61b5.zip
- updated maintainer e-mail address
Approved by: garga (mentor)
-rw-r--r--archivers/aolserver-nszlib/Makefile4
-rw-r--r--archivers/aolserver-nszlib/pkg-descr2
-rw-r--r--archivers/star-devel/Makefile4
-rw-r--r--archivers/tclmkziplib/Makefile4
-rw-r--r--archivers/tclmkziplib/pkg-descr2
-rw-r--r--audio/epos-devel/Makefile4
-rw-r--r--benchmarks/postal/Makefile2
-rw-r--r--databases/adodb/Makefile2
-rw-r--r--databases/aolserver-nsmysql/Makefile4
-rw-r--r--databases/aolserver-nsmysql/pkg-descr2
-rw-r--r--databases/aolserver-nspostgres/Makefile4
-rw-r--r--databases/aolserver-nspostgres/pkg-descr2
-rw-r--r--devel/smake/Makefile4
-rw-r--r--devel/tclcl/Makefile2
-rw-r--r--dns/fastresolve/Makefile2
-rw-r--r--games/hlserver-psychostats/Makefile4
-rw-r--r--graphics/aolserver-nsgd/Makefile4
-rw-r--r--graphics/aolserver-nsgd/pkg-descr2
-rw-r--r--irc/dircproxy-devel/Makefile2
-rw-r--r--irc/tr-ircd/Makefile2
-rw-r--r--irc/tr-ircd/pkg-descr2
-rw-r--r--lang/otcl/Makefile2
-rw-r--r--lang/tcl-tk-wrapper/Makefile4
-rw-r--r--lang/tcl-tk-wrapper/pkg-descr2
-rw-r--r--lang/tcl-wrapper/Makefile4
-rw-r--r--lang/tcl-wrapper/pkg-descr2
-rw-r--r--lang/tcl80/Makefile2
-rw-r--r--lang/tcl82/Makefile2
-rw-r--r--lang/tcl83/Makefile2
-rw-r--r--lang/tcl84/Makefile2
-rw-r--r--lang/tcl85-thread/Makefile2
-rw-r--r--lang/tcl85/Makefile4
-rw-r--r--lang/tcl86-thread/Makefile2
-rw-r--r--lang/tcl86/Makefile4
-rw-r--r--lang/tk-wrapper/Makefile4
-rw-r--r--lang/tk-wrapper/pkg-descr2
-rw-r--r--lang/xotcl/Makefile2
-rw-r--r--math/p5-Math-VecStat/Makefile4
-rw-r--r--net-im/jabber-conference/Makefile2
-rw-r--r--net-im/jabber-jud/Makefile2
-rw-r--r--net-im/jabber-yahoo/Makefile2
-rw-r--r--net-im/jabber/Makefile2
-rw-r--r--net-im/jabber/pkg-descr2
-rw-r--r--net-mgmt/nsca-client/Makefile2
-rw-r--r--net-mgmt/nsca/Makefile2
-rw-r--r--net/p5-RPC-XML/Makefile2
-rw-r--r--security/aolserver-nsencrypt/Makefile4
-rw-r--r--security/aolserver-nsencrypt/pkg-descr2
-rw-r--r--security/aolserver-nsmcrypt/Makefile4
-rw-r--r--security/aolserver-nsmcrypt/pkg-descr2
-rw-r--r--security/aolserver-nsmhash/Makefile4
-rw-r--r--security/aolserver-nsmhash/pkg-descr2
-rw-r--r--security/aolserver-nsopenssl/Makefile4
-rw-r--r--security/aolserver-nsopenssl/pkg-descr2
-rw-r--r--security/aolserver-nssha1/Makefile4
-rw-r--r--security/aolserver-nssha1/pkg-descr2
-rw-r--r--www/aolserver-nscache/Makefile4
-rw-r--r--www/aolserver-nscache/pkg-descr2
-rw-r--r--www/aolserver-xotcl/Makefile2
-rw-r--r--www/aolserver/files/pkg-message.in2
-rw-r--r--www/openacs-dotlrn/Makefile2
-rw-r--r--www/openacs-dotlrn/pkg-descr2
-rw-r--r--www/openacs/Makefile2
-rw-r--r--www/openacs/files/pkg-message.in2
-rw-r--r--www/openacs/pkg-descr2
-rw-r--r--www/p5-Apache-Clean/Makefile4
-rw-r--r--www/p5-Apache-Compress/Makefile4
-rw-r--r--www/tclwebtest/Makefile2
-rw-r--r--www/tdom/Makefile2
-rw-r--r--x11-toolkits/tk80/Makefile2
-rw-r--r--x11-toolkits/tk82/Makefile2
-rw-r--r--x11-toolkits/tk83/Makefile2
-rw-r--r--x11-toolkits/tk84-thread/Makefile2
-rw-r--r--x11-toolkits/tk84/Makefile2
-rw-r--r--x11-toolkits/tk85-thread/Makefile2
-rw-r--r--x11-toolkits/tk85/Makefile4
-rw-r--r--x11-toolkits/tk86-thread/Makefile2
-rw-r--r--x11-toolkits/tk86/Makefile4
78 files changed, 103 insertions, 103 deletions
diff --git a/archivers/aolserver-nszlib/Makefile b/archivers/aolserver-nszlib/Makefile
index 3b0c910c2e79..0888d8e3b508 100644
--- a/archivers/aolserver-nszlib/Makefile
+++ b/archivers/aolserver-nszlib/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: aolserver-nszlib
# Date created: 12 Oct 2006
-# Whom: Martin Matuska <martin@matuska.org>
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= aolserver
DISTNAME= nszlib
DIST_SUBDIR= aolserver
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Zlib library interface for AOLserver
AOLSERVERBASE?= ${PREFIX}/aolserver
diff --git a/archivers/aolserver-nszlib/pkg-descr b/archivers/aolserver-nszlib/pkg-descr
index 52e3bc2717d2..2c72f06fecc0 100644
--- a/archivers/aolserver-nszlib/pkg-descr
+++ b/archivers/aolserver-nszlib/pkg-descr
@@ -3,4 +3,4 @@ AOLserver interface to zlib library
WWW: http://www.crystalballinc.com/vlad/software/
- Martin Matuska
-martin@matuska.org
+mm@FreeBSD.org
diff --git a/archivers/star-devel/Makefile b/archivers/star-devel/Makefile
index f976b13a7948..5cf219acac61 100644
--- a/archivers/star-devel/Makefile
+++ b/archivers/star-devel/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: star-devel
# Date created: 19.06.2004 22:27:00 CEST
-# Whom: Martin Matuska <martin@matuska.org>
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
@@ -10,7 +10,7 @@ DISTVERSION= 1.5a76
CATEGORIES= archivers
MASTER_SITES= ftp://ftp.berlios.de/pub/star/alpha/
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Unique standard tape archiver with many enhancements
BUILD_DEPENDS= ${LOCALBASE}/bin/smake:${PORTSDIR}/devel/smake
diff --git a/archivers/tclmkziplib/Makefile b/archivers/tclmkziplib/Makefile
index 4c7c482ed182..818cb618c0b5 100644
--- a/archivers/tclmkziplib/Makefile
+++ b/archivers/tclmkziplib/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: tclmkziplib
# Date created: 4 Jan 2007
-# Whom: martin@matuska.org
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= archivers tcl83 tcl84
MASTER_SITES= http://mkextensions.sourceforge.net/
DISTNAME= mkZiplib${PORTVERSION:S/.//}
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= GZIP and ZIP support for TCL; dynamicly loadable
TCL_VER?= 8.4
diff --git a/archivers/tclmkziplib/pkg-descr b/archivers/tclmkziplib/pkg-descr
index e87e1573c6f9..ee1942a24560 100644
--- a/archivers/tclmkziplib/pkg-descr
+++ b/archivers/tclmkziplib/pkg-descr
@@ -7,4 +7,4 @@ work with .gz and .zip files from within Tcl.
WWW: http://mkextensions.sourceforge.net
- Martin Matuska
-martin@matuska.org
+mm@FreeBSD.org
diff --git a/audio/epos-devel/Makefile b/audio/epos-devel/Makefile
index c3e4526e6326..998b23330faa 100644
--- a/audio/epos-devel/Makefile
+++ b/audio/epos-devel/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: epos-devel
# Date created: 3 September 2005
-# Whom: martin@matuska.org
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= epos
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Text-to-Speech system
GNU_CONFIGURE= yes
diff --git a/benchmarks/postal/Makefile b/benchmarks/postal/Makefile
index c1d2ca4a2ee9..05c0f6580e65 100644
--- a/benchmarks/postal/Makefile
+++ b/benchmarks/postal/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= benchmarks mail
MASTER_SITES= http://www.coker.com.au/postal/
EXTRACT_SUFX= .tgz
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Benchmark SMTP/POP servers
USE_OPENSSL= yes
diff --git a/databases/adodb/Makefile b/databases/adodb/Makefile
index 4c10f2d6bbcf..130c9781dfb6 100644
--- a/databases/adodb/Makefile
+++ b/databases/adodb/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= adodb
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//}
EXTRACT_SUFX= .tgz
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Database library for PHP
USE_PHP= pcre
diff --git a/databases/aolserver-nsmysql/Makefile b/databases/aolserver-nsmysql/Makefile
index b44d5d1bb144..42d97c7fea45 100644
--- a/databases/aolserver-nsmysql/Makefile
+++ b/databases/aolserver-nsmysql/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: aolserver-nsmysql
# Date created: 12 Oct 2006
-# Whom: Martin Matuska <martin@matuska.org>
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= aolserver
DISTFILES= nsmysql_v1.tar.gz
DIST_SUBDIR= aolserver
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Internal MySQL database driver for AOLserver
WRKSRC= ${WRKDIR}/nsmysql_v1
diff --git a/databases/aolserver-nsmysql/pkg-descr b/databases/aolserver-nsmysql/pkg-descr
index b2be3c3c67c7..1ae7aaae2478 100644
--- a/databases/aolserver-nsmysql/pkg-descr
+++ b/databases/aolserver-nsmysql/pkg-descr
@@ -4,4 +4,4 @@ Panoptic Computer Network.
WWW: http://www.aolserver.com/
- Martin Matuska
-martin@matuska.org
+mm@FreeBSD.org
diff --git a/databases/aolserver-nspostgres/Makefile b/databases/aolserver-nspostgres/Makefile
index 6acc3055ab76..dadcc269bc71 100644
--- a/databases/aolserver-nspostgres/Makefile
+++ b/databases/aolserver-nspostgres/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: aolserver-nspostgres
# Date created: 12 Oct 2006
-# Whom: Martin Matuska <martin@matuska.org>
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= aolserver
DISTFILES= nspostgres-${PORTVERSION}.tar.gz
DIST_SUBDIR= aolserver
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Internal PostgreSQL driver for AOLserver
WRKSRC= ${WRKDIR}/nspostgres-${PORTVERSION}
diff --git a/databases/aolserver-nspostgres/pkg-descr b/databases/aolserver-nspostgres/pkg-descr
index 20efafa20cd2..5a13db6b675b 100644
--- a/databases/aolserver-nspostgres/pkg-descr
+++ b/databases/aolserver-nspostgres/pkg-descr
@@ -3,4 +3,4 @@ nspostgres is an internal PostgreSQL database driver for AOLserver 3.x and 4.x.
WWW: http://www.aolserver.com/
- Martin Matuska
-martin@matuska.org
+mm@FreeBSD.org
diff --git a/devel/smake/Makefile b/devel/smake/Makefile
index f03cfd2d4783..88b9978e437d 100644
--- a/devel/smake/Makefile
+++ b/devel/smake/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: smake
# Date created: 22 February 2005
-# Whom: Martin Matuska <martin@matuska.org>
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
@@ -11,7 +11,7 @@ CATEGORIES= devel
MASTER_SITES= ftp://ftp.berlios.de/pub/smake/alpha/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.a./a/}
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Highly portable make program with automake features
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/.a.*//g}
diff --git a/devel/tclcl/Makefile b/devel/tclcl/Makefile
index 60213d93d859..c36079b60e1b 100644
--- a/devel/tclcl/Makefile
+++ b/devel/tclcl/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= devel tcl84 tk84
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= otcl-tclcl
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Tcl/C++ interface used by ns and nam
LIB_DEPENDS= otcl:${PORTSDIR}/lang/otcl
diff --git a/dns/fastresolve/Makefile b/dns/fastresolve/Makefile
index 1b4f4cb0c2de..0eb92b159be9 100644
--- a/dns/fastresolve/Makefile
+++ b/dns/fastresolve/Makefile
@@ -11,7 +11,7 @@ PORTREVISION= 4
CATEGORIES= dns
MASTER_SITES= http://www.djmnet.org/sw/dist/
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Programs that process web logs to get DNS and domain ownership info
LIB_DEPENDS= adns.1:${PORTSDIR}/dns/adns
diff --git a/games/hlserver-psychostats/Makefile b/games/hlserver-psychostats/Makefile
index 78a88e6c846e..4520d8890d99 100644
--- a/games/hlserver-psychostats/Makefile
+++ b/games/hlserver-psychostats/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: Half Life Psychostats
# Date created: Sun Oct 14 14:34:20 CEST 2001
-# Whom: martin@matuska.org
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
@@ -16,7 +16,7 @@ MASTER_SITES= ftp://ftp.thaiguy.net/ \
http://mirrors.voyager.net/games/halflife/stats/psychostats/
DISTNAME= ${PORTNAME}${PORTVERSION}
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Popular player statistics generator for Half-Life (cs/dod)
USE_PERL5_BUILD=yes
diff --git a/graphics/aolserver-nsgd/Makefile b/graphics/aolserver-nsgd/Makefile
index 3d396bc0035e..9e33a8be289a 100644
--- a/graphics/aolserver-nsgd/Makefile
+++ b/graphics/aolserver-nsgd/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: aolserver-nsgd
# Date created: 12 Oct 2006
-# Whom: Martin Matuska <martin@matuska.org>
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}2
EXTRACT_SUFX= .tgz
DIST_SUBDIR= aolserver
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Graphics module for AOLserver
WRKSRC= ${WRKDIR}
diff --git a/graphics/aolserver-nsgd/pkg-descr b/graphics/aolserver-nsgd/pkg-descr
index 34c781841ef5..fc6b3a7ab73d 100644
--- a/graphics/aolserver-nsgd/pkg-descr
+++ b/graphics/aolserver-nsgd/pkg-descr
@@ -3,4 +3,4 @@ Graphics module for aolserver (3.x,4.x)
WWW: http://www.aolserver.cz/
- Martin Matuska
-martin@matuska.org
+mm@FreeBSD.org
diff --git a/irc/dircproxy-devel/Makefile b/irc/dircproxy-devel/Makefile
index 447dbb7b1a9c..a2dbfcaeb561 100644
--- a/irc/dircproxy-devel/Makefile
+++ b/irc/dircproxy-devel/Makefile
@@ -13,7 +13,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b/-beta/g}
PKGNAMESUFFIX= -devel
EXTRACT_SUFX= .tar.bz
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= A detachable irc proxy server with many features
USE_BZIP2= yes
diff --git a/irc/tr-ircd/Makefile b/irc/tr-ircd/Makefile
index f98a873cf18c..54c2faacdda1 100644
--- a/irc/tr-ircd/Makefile
+++ b/irc/tr-ircd/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME:S/-//}-release-${PORTVERSION}-r
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= An irc daeemon based on Bahamut and hybrid-7
USE_GMAKE= yes
diff --git a/irc/tr-ircd/pkg-descr b/irc/tr-ircd/pkg-descr
index 3b74eff44aa0..fd7eb6f4110c 100644
--- a/irc/tr-ircd/pkg-descr
+++ b/irc/tr-ircd/pkg-descr
@@ -6,4 +6,4 @@ WWW: http://tr-ircd.sourceforge.net/
ale@FreeBSD.org
- Martin Matuska
-martin@matuska.org
+mm@FreeBSD.org
diff --git a/lang/otcl/Makefile b/lang/otcl/Makefile
index 6a8f600865d4..8c0e2e501477 100644
--- a/lang/otcl/Makefile
+++ b/lang/otcl/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= lang tcl84 tk84
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= otcl-tclcl
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= MIT Object Tcl
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/lang/tcl-tk-wrapper/Makefile b/lang/tcl-tk-wrapper/Makefile
index 497050078f24..01235e4e8a55 100644
--- a/lang/tcl-tk-wrapper/Makefile
+++ b/lang/tcl-tk-wrapper/Makefile
@@ -1,6 +1,6 @@
# Ports collection makefile for: tcl-tk-wrapper
# Date created: 4 March 2007
-# Whom: martin@matuska.org
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ PKGNAMEPREFIX= tcl-tk-
DISTFILES= # none
EXTRACT_ONLY= # empty
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Shell wrapper for tclsh and wish (Tcl/Tk)
NO_BUILD= yes
diff --git a/lang/tcl-tk-wrapper/pkg-descr b/lang/tcl-tk-wrapper/pkg-descr
index a689e2a6c28f..fe10675e098a 100644
--- a/lang/tcl-tk-wrapper/pkg-descr
+++ b/lang/tcl-tk-wrapper/pkg-descr
@@ -9,4 +9,4 @@ To make use of the "wish" wrapper, users need to install tk.
Recommended tk ports: x11-toolkits/tk84 x11-toolkits/tk85
- Martin Matuska
-martin@matuska.org
+mm@FreeBSD.org
diff --git a/lang/tcl-wrapper/Makefile b/lang/tcl-wrapper/Makefile
index 8488115995cf..5d20cb27822a 100644
--- a/lang/tcl-wrapper/Makefile
+++ b/lang/tcl-wrapper/Makefile
@@ -1,6 +1,6 @@
# Ports collection makefile for: tcl-wrapper
# Date created: 4 March 2007
-# Whom: martin@matuska.org
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ PKGNAMEPREFIX= ${TX_PORT}-
DISTFILES= # none
EXTRACT_ONLY= # empty
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Shell wrapper for ${TX_SHELL} (${TX_PORT_U})
NO_BUILD= yes
diff --git a/lang/tcl-wrapper/pkg-descr b/lang/tcl-wrapper/pkg-descr
index 18e16822a3d2..317cc330966a 100644
--- a/lang/tcl-wrapper/pkg-descr
+++ b/lang/tcl-wrapper/pkg-descr
@@ -3,4 +3,4 @@ comes with different versions of Tcl. Users can define in a configuration file
which version of the Tcl shell should be called.
- Martin Matuska
-martin@matuska.org
+mm@FreeBSD.org
diff --git a/lang/tcl80/Makefile b/lang/tcl80/Makefile
index e9acf84030cd..bc444c8c7852 100644
--- a/lang/tcl80/Makefile
+++ b/lang/tcl80/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ${MASTER_SITE_TCLTK}
MASTER_SITE_SUBDIR=tcl8_0
DISTNAME= ${PORTNAME}${PORTVERSION}
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Tool Command Language
NO_LATEST_LINK= yes
diff --git a/lang/tcl82/Makefile b/lang/tcl82/Makefile
index 79e04b22db04..c5a1861608e6 100644
--- a/lang/tcl82/Makefile
+++ b/lang/tcl82/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ${MASTER_SITE_TCLTK}
MASTER_SITE_SUBDIR= tcl8_2
DISTNAME= ${PORTNAME}${PORTVERSION}
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Tool Command Language
LATEST_LINK= tcl82
diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile
index 105402cef5cc..32299a359510 100644
--- a/lang/tcl83/Makefile
+++ b/lang/tcl83/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tcl
DISTNAME= ${PORTNAME}${PORTVERSION}-src
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Tool Command Language
LATEST_LINK= tcl83
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index d1bce335ce0d..3eb1efe66397 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= SF
PKGNAMESUFFIX?= ${THREADS_SUFFIX}${PKGNAMESUFFIX2}
DISTNAME= ${PORTNAME}${PORTVERSION}-src
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Tool Command Language
PATCH_DIST_ARGS= -d ${WRKDIR}/${DISTNAME} -E ${PATCH_DIST_STRIP}
diff --git a/lang/tcl85-thread/Makefile b/lang/tcl85-thread/Makefile
index 4817579ec93f..ce77356ffcae 100644
--- a/lang/tcl85-thread/Makefile
+++ b/lang/tcl85-thread/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: tcl85-thread
# Date created: 17 January 2007
-# Whom: martin@matuska.org
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/lang/tcl85/Makefile b/lang/tcl85/Makefile
index 258e5ca84603..67606a72590a 100644
--- a/lang/tcl85/Makefile
+++ b/lang/tcl85/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: tcl8.5
# Date created: 17 January 2007
-# Whom: martin@matuska.org
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= tcl
PKGNAMESUFFIX?= ${THREADS_SUFFIX}${PKGNAMESUFFIX2}
DISTNAME= ${PORTNAME}${PORTVERSION:S/.a./a/}-src
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Tool Command Language (development version)
PATCH_DIST_ARGS= -d ${WRKDIR}/${DISTNAME} -E ${PATCH_DIST_STRIP}
diff --git a/lang/tcl86-thread/Makefile b/lang/tcl86-thread/Makefile
index 4817579ec93f..ce77356ffcae 100644
--- a/lang/tcl86-thread/Makefile
+++ b/lang/tcl86-thread/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: tcl85-thread
# Date created: 17 January 2007
-# Whom: martin@matuska.org
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile
index 258e5ca84603..67606a72590a 100644
--- a/lang/tcl86/Makefile
+++ b/lang/tcl86/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: tcl8.5
# Date created: 17 January 2007
-# Whom: martin@matuska.org
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= tcl
PKGNAMESUFFIX?= ${THREADS_SUFFIX}${PKGNAMESUFFIX2}
DISTNAME= ${PORTNAME}${PORTVERSION:S/.a./a/}-src
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Tool Command Language (development version)
PATCH_DIST_ARGS= -d ${WRKDIR}/${DISTNAME} -E ${PATCH_DIST_STRIP}
diff --git a/lang/tk-wrapper/Makefile b/lang/tk-wrapper/Makefile
index df45fd88acf4..8015874ec4dd 100644
--- a/lang/tk-wrapper/Makefile
+++ b/lang/tk-wrapper/Makefile
@@ -1,11 +1,11 @@
# New ports collection makefile for: tk-wrapper
# Date created: 21 March 2007
-# Whom: Martin Matuska <martin@matuska.org>
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
BUILDING_TK_WRAPPER= yes
diff --git a/lang/tk-wrapper/pkg-descr b/lang/tk-wrapper/pkg-descr
index 7868eb439022..c0f4c7216fc0 100644
--- a/lang/tk-wrapper/pkg-descr
+++ b/lang/tk-wrapper/pkg-descr
@@ -3,4 +3,4 @@ comes with different versions of Tk. Users can define in a configuration file
which version of the Tk shell wish should be called.
- Martin Matuska
-martin@matuska.org
+mm@FreeBSD.org
diff --git a/lang/xotcl/Makefile b/lang/xotcl/Makefile
index f0057a4187d9..e39fbaa785d1 100644
--- a/lang/xotcl/Makefile
+++ b/lang/xotcl/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: xotcl
# Date created: Mon Sep 25 15:31:00 CET 2006
-# Whom: Martin Matuska <martin@matuska.org>
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/math/p5-Math-VecStat/Makefile b/math/p5-Math-VecStat/Makefile
index 2ceca8d3977e..61a0166e0e26 100644
--- a/math/p5-Math-VecStat/Makefile
+++ b/math/p5-Math-VecStat/Makefile
@@ -1,7 +1,7 @@
# vim:ts=8
# New ports collection makefile for: p5-Math-VecStat
# Date created: 25 Februar 2005
-# Whom: Martin Matuska <martin@matuska.org>
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Math
PKGNAMEPREFIX= p5-
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Basic statistics on vectors
PERL_CONFIGURE= yes
diff --git a/net-im/jabber-conference/Makefile b/net-im/jabber-conference/Makefile
index 3008b6489070..a521b0dacd56 100644
--- a/net-im/jabber-conference/Makefile
+++ b/net-im/jabber-conference/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://freebsd.unixfreunde.de/sources/
PKGNAMEPREFIX= jabber-
DIST_SUBDIR= jabber
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Jabber Conferencing module
LIB_DEPENDS= jabberd.1:${PORTSDIR}/net-im/jabber
diff --git a/net-im/jabber-jud/Makefile b/net-im/jabber-jud/Makefile
index d66b3d5cbd48..b27a6e362823 100644
--- a/net-im/jabber-jud/Makefile
+++ b/net-im/jabber-jud/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://jud.jabberstudio.org/ \
PKGNAMEPREFIX= jabber-
DIST_SUBDIR= jabber
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Jabber User Directory module
LIB_DEPENDS= jabberd.1:${PORTSDIR}/net-im/jabber
diff --git a/net-im/jabber-yahoo/Makefile b/net-im/jabber-yahoo/Makefile
index dad047a4f557..f406c55f2d00 100644
--- a/net-im/jabber-yahoo/Makefile
+++ b/net-im/jabber-yahoo/Makefile
@@ -13,7 +13,7 @@ PKGNAMEPREFIX= jabber-
DISTNAME= yahoo-transport-${PORTVERSION}
DIST_SUBDIR= jabber
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Jabber Yahoo Transport module
LIB_DEPENDS= jabberd.1:${PORTSDIR}/net-im/jabber
diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile
index 625ddd701db8..548a67997f4e 100644
--- a/net-im/jabber/Makefile
+++ b/net-im/jabber/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://download.jabberd.org/jabberd14/
DISTNAME= jabberd14-${PORTVERSION}
DIST_SUBDIR= jabber
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= XMPP/Jabber server daemon
LIB_DEPENDS= pth.20:${PORTSDIR}/devel/pth-hard \
diff --git a/net-im/jabber/pkg-descr b/net-im/jabber/pkg-descr
index 48e449b7c5d8..d62833d9ca87 100644
--- a/net-im/jabber/pkg-descr
+++ b/net-im/jabber/pkg-descr
@@ -9,4 +9,4 @@ You can learn more about jabberd14 at
WWW: http://jabberd.org/
- Martin Matuska
-martin@matuska.org
+mm@FreeBSD.org
diff --git a/net-mgmt/nsca-client/Makefile b/net-mgmt/nsca-client/Makefile
index 2de06d95bd99..80f0146e2381 100644
--- a/net-mgmt/nsca-client/Makefile
+++ b/net-mgmt/nsca-client/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: nsca-client
# Date created: Sun Apr 30 17:23:00 CET 2006
-# Whom: Martin Matuska <martin@matuska.org>
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/net-mgmt/nsca/Makefile b/net-mgmt/nsca/Makefile
index 1302174f51c5..0fde7e2c8178 100644
--- a/net-mgmt/nsca/Makefile
+++ b/net-mgmt/nsca/Makefile
@@ -11,7 +11,7 @@ CATEGORIES= net-mgmt
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= nagios
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Nagios Service Check Acceptor
.if !defined(WITHOUT_SERVER)
diff --git a/net/p5-RPC-XML/Makefile b/net/p5-RPC-XML/Makefile
index fac87e9afeff..f4e2c8acb954 100644
--- a/net/p5-RPC-XML/Makefile
+++ b/net/p5-RPC-XML/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= RPC
PKGNAMEPREFIX= p5-
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= XML-RPC client and server library for Perl
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
diff --git a/security/aolserver-nsencrypt/Makefile b/security/aolserver-nsencrypt/Makefile
index 4f8209f428e8..9c70d49eaa14 100644
--- a/security/aolserver-nsencrypt/Makefile
+++ b/security/aolserver-nsencrypt/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: aolserver-nsencrypt
# Date created: 12 Oct 2006
-# Whom: Martin Matuska <martin@matuska.org>
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= aolserver
DISTFILES= nsencrypt-${PORTVERSION}-src.tar.gz
DIST_SUBDIR= aolserver
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= OpenSSL data encryption module for AOLserver
WRKSRC= ${WRKDIR}/nsencrypt-${PORTVERSION}
diff --git a/security/aolserver-nsencrypt/pkg-descr b/security/aolserver-nsencrypt/pkg-descr
index 8e91c0f7b13e..8e1dee1255c0 100644
--- a/security/aolserver-nsencrypt/pkg-descr
+++ b/security/aolserver-nsencrypt/pkg-descr
@@ -4,4 +4,4 @@ AES, Blowfish, Cast5, IDEA and DES cyphers.
WWW: http://www.aolserver.com/
- Martin Matuska
-martin@matuska.org
+mm@FreeBSD.org
diff --git a/security/aolserver-nsmcrypt/Makefile b/security/aolserver-nsmcrypt/Makefile
index 0ccb7e5982f5..426ebe5b4955 100644
--- a/security/aolserver-nsmcrypt/Makefile
+++ b/security/aolserver-nsmcrypt/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: aolserver-nsmcrypt
# Date created: 12 Oct 2006
-# Whom: Martin Matuska <martin@matuska.org>
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
@@ -14,7 +14,7 @@ PKGNAMEPREFIX= aolserver-
EXTRACT_SUFX= .tgz
DIST_SUBDIR= aolserver
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= AOLserver interface to mcrypt library
WRKSRC= ${WRKDIR}
diff --git a/security/aolserver-nsmcrypt/pkg-descr b/security/aolserver-nsmcrypt/pkg-descr
index aa30111d590a..3aa01b6ab77e 100644
--- a/security/aolserver-nsmcrypt/pkg-descr
+++ b/security/aolserver-nsmcrypt/pkg-descr
@@ -3,4 +3,4 @@ AOLserver interface to mcrypt library
WWW: http://www.aolserver.cz/
- Martin Matuska
-martin@matuska.org
+mm@FreeBSD.org
diff --git a/security/aolserver-nsmhash/Makefile b/security/aolserver-nsmhash/Makefile
index 7c79eab3f749..1be411ec1b5e 100644
--- a/security/aolserver-nsmhash/Makefile
+++ b/security/aolserver-nsmhash/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: aolserver-nsmhash
# Date created: 12 Oct 2006
-# Whom: Martin Matuska <martin@matuska.org>
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
@@ -14,7 +14,7 @@ PKGNAMEPREFIX= aolserver-
EXTRACT_SUFX= .tgz
DIST_SUBDIR= aolserver
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= AOLserver interface to mhash library
WRKSRC= ${WRKDIR}
diff --git a/security/aolserver-nsmhash/pkg-descr b/security/aolserver-nsmhash/pkg-descr
index 18f40362c8d0..22180bc449dd 100644
--- a/security/aolserver-nsmhash/pkg-descr
+++ b/security/aolserver-nsmhash/pkg-descr
@@ -3,4 +3,4 @@ AOLserver interface to mhash library
WWW: http://www.aolserver.cz/
- Martin Matuska
-martin@matuska.org
+mm@FreeBSD.org
diff --git a/security/aolserver-nsopenssl/Makefile b/security/aolserver-nsopenssl/Makefile
index a2143d9b608b..e632f9dd038f 100644
--- a/security/aolserver-nsopenssl/Makefile
+++ b/security/aolserver-nsopenssl/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: aolserver-nsopenssl
# Date created: 12 Oct 2006
-# Whom: Martin Matuska <martin@matuska.org>
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= aolserver
DISTFILES= nsopenssl-3.0beta26-src.tar.gz
DIST_SUBDIR= aolserver
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= OpenSSL socket encryption module for AOLserver
WRKSRC= ${WRKDIR}/nsopenssl-3.0beta26
diff --git a/security/aolserver-nsopenssl/pkg-descr b/security/aolserver-nsopenssl/pkg-descr
index e91a2ba3655e..c95f1577f5fb 100644
--- a/security/aolserver-nsopenssl/pkg-descr
+++ b/security/aolserver-nsopenssl/pkg-descr
@@ -4,4 +4,4 @@ incomming sockets, and also adds an https client API.
WWW: http://www.aolserver.com/
- Martin Matuska
-martin@matuska.org
+mm@FreeBSD.org
diff --git a/security/aolserver-nssha1/Makefile b/security/aolserver-nssha1/Makefile
index 981808008806..3514dccbcc1e 100644
--- a/security/aolserver-nssha1/Makefile
+++ b/security/aolserver-nssha1/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: aolserver-nssha1
# Date created: 12 Oct 2006
-# Whom: Martin Matuska <martin@matuska.org>
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= aolserver
DISTFILES= nssha1-${PORTVERSION}.tar.gz
DIST_SUBDIR= aolserver
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= AOLserver module to perform SHA1 hashes
WRKSRC= ${WRKDIR}/nssha1-${PORTVERSION}
diff --git a/security/aolserver-nssha1/pkg-descr b/security/aolserver-nssha1/pkg-descr
index 0b24845b50fa..205b117362f6 100644
--- a/security/aolserver-nssha1/pkg-descr
+++ b/security/aolserver-nssha1/pkg-descr
@@ -3,4 +3,4 @@ This AOLserver module performs SHA1 hashes.
WWW: http://www.aolserver.com/
- Martin Matuska
-martin@matuska.org
+mm@FreeBSD.org
diff --git a/www/aolserver-nscache/Makefile b/www/aolserver-nscache/Makefile
index 178d5f6fc5af..8d357d47956b 100644
--- a/www/aolserver-nscache/Makefile
+++ b/www/aolserver-nscache/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: aolserver-nscache
# Date created: 12 Oct 2006
-# Whom: Martin Matuska <martin@matuska.org>
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= aolserver
DISTFILES= nscache-${PORTVERSION}.tar.gz
DIST_SUBDIR= aolserver
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Tcl interface to AOLserver's caching API
WRKSRC= ${WRKDIR}/nscache-${PORTVERSION}
diff --git a/www/aolserver-nscache/pkg-descr b/www/aolserver-nscache/pkg-descr
index 51f3bc26febd..ffac3ea9e1e9 100644
--- a/www/aolserver-nscache/pkg-descr
+++ b/www/aolserver-nscache/pkg-descr
@@ -7,4 +7,4 @@ using nsd8x, or AOLserver 4.x.
WWW: http://www.aolserver.com/
- Martin Matuska
-martin@matuska.org
+mm@FreeBSD.org
diff --git a/www/aolserver-xotcl/Makefile b/www/aolserver-xotcl/Makefile
index b4a7d26d45ec..ec9c84ad6be9 100644
--- a/www/aolserver-xotcl/Makefile
+++ b/www/aolserver-xotcl/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: aolserver-xotcl
# Date created: 28 February 2007
-# Whom: Martin Matuska <martin@matuska.org>
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/www/aolserver/files/pkg-message.in b/www/aolserver/files/pkg-message.in
index a34463afc682..76fda8d4eaee 100644
--- a/www/aolserver/files/pkg-message.in
+++ b/www/aolserver/files/pkg-message.in
@@ -12,4 +12,4 @@ chosing a different configuration file.
aldert@nooitgedagt.net
-Martin Matuska
-martin@matuska.org
+mm@FreeBSD.org
diff --git a/www/openacs-dotlrn/Makefile b/www/openacs-dotlrn/Makefile
index 9e2456614062..8038532ae32a 100644
--- a/www/openacs-dotlrn/Makefile
+++ b/www/openacs-dotlrn/Makefile
@@ -10,7 +10,7 @@ PORTVERSION= 2.2.1
MASTER_SITES= http://openacs.org/projects/dotlrn/download/download/
EXTRACT_SUFX= .tgz?revision_id=559791
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= OpenACS-based e-learning platform for high-traffic communities
OPENACS_USER?= dotlrn
diff --git a/www/openacs-dotlrn/pkg-descr b/www/openacs-dotlrn/pkg-descr
index 80d23b245843..526d42672369 100644
--- a/www/openacs-dotlrn/pkg-descr
+++ b/www/openacs-dotlrn/pkg-descr
@@ -17,4 +17,4 @@ WWW: http://dotlrn.org
aldert@nooitgedagt.net
- Martin Matuska
-martin@matuska.org
+mm@FreeBSD.org
diff --git a/www/openacs/Makefile b/www/openacs/Makefile
index 929459caa12b..6b5e38c46ab8 100644
--- a/www/openacs/Makefile
+++ b/www/openacs/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= www
MASTER_SITES?= http://openacs.org/projects/openacs/download/download/
EXTRACT_SUFX?= .tgz?revision_id=583060
-MAINTAINER?= martin@matuska.org
+MAINTAINER?= mm@FreeBSD.org
COMMENT?= A modular web application platform for high traffic communities
AOLSERVERBASE?= ${LOCALBASE}/aolserver
diff --git a/www/openacs/files/pkg-message.in b/www/openacs/files/pkg-message.in
index fc48e1d1f9a1..ca5b5d2c41b8 100644
--- a/www/openacs/files/pkg-message.in
+++ b/www/openacs/files/pkg-message.in
@@ -31,4 +31,4 @@ If you want to use keepalive via cron, you might want to look here:
%%EXAMPLESDIR%%/keepalive/
-Martin Matuska
-martin@matuska.org
+mm@FreeBSD.org
diff --git a/www/openacs/pkg-descr b/www/openacs/pkg-descr
index 1f9d85385b82..891f81012e10 100644
--- a/www/openacs/pkg-descr
+++ b/www/openacs/pkg-descr
@@ -17,4 +17,4 @@ WWW: http://openacs.org
aldert@nooitgedagt.net
- Martin Matuska
-martin@matuska.org
+mm@FreeBSD.org
diff --git a/www/p5-Apache-Clean/Makefile b/www/p5-Apache-Clean/Makefile
index 36d279ca8b0f..264a0e72b816 100644
--- a/www/p5-Apache-Clean/Makefile
+++ b/www/p5-Apache-Clean/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: p5-Apache-Clean
# Date created: Sep 09 2003
-# Whom: Martin Matuska <martin@matuska.org>
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Apache/GEOFF
PKGNAMEPREFIX= p5-
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= A mod_perl interface into HTML::Clean
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache.pm:${PORTSDIR}/www/mod_perl \
diff --git a/www/p5-Apache-Compress/Makefile b/www/p5-Apache-Compress/Makefile
index 4a073f8b7e58..5b574faa815e 100644
--- a/www/p5-Apache-Compress/Makefile
+++ b/www/p5-Apache-Compress/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: p5-Apache-Compress
# Date created: Sep 09 2003
-# Whom: Martin Matuska <martin@matuska.org>
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
@@ -12,7 +12,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Apache/KWILLIAMS
PKGNAMEPREFIX= p5-
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Auto-compress web files with Gzip
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Apache.pm:${PORTSDIR}/www/mod_perl \
diff --git a/www/tclwebtest/Makefile b/www/tclwebtest/Makefile
index 90ad17d50928..bc02e816cf3e 100644
--- a/www/tclwebtest/Makefile
+++ b/www/tclwebtest/Makefile
@@ -12,7 +12,7 @@ CATEGORIES= www tcl84
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Tool for issuing HTTP requests and dealing with the result
RUN_DEPENDS= tclsh:${PORTSDIR}/lang/tcl-wrapper
diff --git a/www/tdom/Makefile b/www/tdom/Makefile
index bed6221b1c6d..c57b6d16881b 100644
--- a/www/tdom/Makefile
+++ b/www/tdom/Makefile
@@ -11,7 +11,7 @@ PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= http://www.tdom.org/files/
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= High performance XML data processing with Tcl (ARGS for OpenACS)
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/unix
diff --git a/x11-toolkits/tk80/Makefile b/x11-toolkits/tk80/Makefile
index 922112771aa5..187fdafab240 100644
--- a/x11-toolkits/tk80/Makefile
+++ b/x11-toolkits/tk80/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ${MASTER_SITE_TCLTK}
MASTER_SITE_SUBDIR= tcl8_0
DISTNAME= ${PORTNAME}${PORTVERSION}
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Graphical toolkit for TCL
USE_TCL= 80
diff --git a/x11-toolkits/tk82/Makefile b/x11-toolkits/tk82/Makefile
index 951a80cc5ee5..2949c0a4ae08 100644
--- a/x11-toolkits/tk82/Makefile
+++ b/x11-toolkits/tk82/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ${MASTER_SITE_TCLTK}
MASTER_SITE_SUBDIR= tcl8_2
DISTNAME= ${PORTNAME}${PORTVERSION}
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Graphical toolkit for TCL
USE_TCL= 82
diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile
index 315169c286b2..8e19fbb05d81 100644
--- a/x11-toolkits/tk83/Makefile
+++ b/x11-toolkits/tk83/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tcl
DISTNAME= ${PORTNAME}${PORTVERSION}-src
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Graphical toolkit for TCL
USE_TCL= 83
diff --git a/x11-toolkits/tk84-thread/Makefile b/x11-toolkits/tk84-thread/Makefile
index cbf110bb4bc9..0eeca36e1989 100644
--- a/x11-toolkits/tk84-thread/Makefile
+++ b/x11-toolkits/tk84-thread/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: tk84-thread
# Date created: 09 March 2007
-# Whom: Martin Matuska <martin@matuska.org>
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index 45f9c0281978..b8255bd04b09 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= tcl
PKGNAMESUFFIX?= ${THREADS_SUFFIX}
DISTNAME= ${PORTNAME}${PORTVERSION}-src
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Graphical toolkit for TCL
LATEST_LINK?= tk84
diff --git a/x11-toolkits/tk85-thread/Makefile b/x11-toolkits/tk85-thread/Makefile
index 2a5649e6511b..fba21cbd4643 100644
--- a/x11-toolkits/tk85-thread/Makefile
+++ b/x11-toolkits/tk85-thread/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: tk85-thread
# Date created: 09 March 2007
-# Whom: Martin Matuska <martin@matuska.org>
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/x11-toolkits/tk85/Makefile b/x11-toolkits/tk85/Makefile
index 612ea8985b13..d24a618580ff 100644
--- a/x11-toolkits/tk85/Makefile
+++ b/x11-toolkits/tk85/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: tk
# Date created: 17 January 2007
-# Whom: Martin Matuska <martin@matuska.org>
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= tcl
PKGNAMESUFFIX?= ${THREADS_SUFFIX}
DISTNAME= ${PORTNAME}${PORTVERSION:S/.a./a/}-src
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Graphical toolkit for TCL
LATEST_LINK?= tk85
diff --git a/x11-toolkits/tk86-thread/Makefile b/x11-toolkits/tk86-thread/Makefile
index 2a5649e6511b..fba21cbd4643 100644
--- a/x11-toolkits/tk86-thread/Makefile
+++ b/x11-toolkits/tk86-thread/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: tk85-thread
# Date created: 09 March 2007
-# Whom: Martin Matuska <martin@matuska.org>
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile
index 612ea8985b13..d24a618580ff 100644
--- a/x11-toolkits/tk86/Makefile
+++ b/x11-toolkits/tk86/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: tk
# Date created: 17 January 2007
-# Whom: Martin Matuska <martin@matuska.org>
+# Whom: Martin Matuska <mm@FreeBSD.org>
#
# $FreeBSD$
#
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= tcl
PKGNAMESUFFIX?= ${THREADS_SUFFIX}
DISTNAME= ${PORTNAME}${PORTVERSION:S/.a./a/}-src
-MAINTAINER= martin@matuska.org
+MAINTAINER= mm@FreeBSD.org
COMMENT= Graphical toolkit for TCL
LATEST_LINK?= tk85