From b2d4b657d1239d23bc853122a6b73045c9553ff9 Mon Sep 17 00:00:00 2001
From: Thomas Abthorpe <tabthorpe@FreeBSD.org>
Date: Wed, 9 Jan 2013 19:50:06 +0000
Subject: [PATCH] - Change MAINTAINER address - Trim headers while I am here -
 Clean up some trailing whitespace

---
 benchmarks/blogbench/Makefile               | 8 ++------
 comms/scmxx/Makefile                        | 8 ++------
 databases/p5-DBM-Deep/Makefile              | 8 ++------
 databases/rrdman/Makefile                   | 8 ++------
 devel/p5-FileHandle-Fmode/Makefile          | 8 ++------
 devel/xmltooling/Makefile                   | 8 ++------
 dns/dnsdoctor/Makefile                      | 8 ++------
 dns/zonecheck/Makefile                      | 2 +-
 editors/cream/Makefile                      | 8 ++------
 emulators/yape/Makefile                     | 8 ++------
 french/jdictionary-fre-hun/Makefile         | 6 +-----
 games/bubbros/Makefile                      | 8 ++------
 games/hohlin/Makefile                       | 8 ++------
 games/pathological/Makefile                 | 8 ++------
 games/polypuzzle/Makefile                   | 8 ++------
 games/py-ski/Makefile                       | 8 ++------
 german/jdictionary-eng-ger/Makefile         | 6 +-----
 german/jdictionary-ger-hun/Makefile         | 6 +-----
 graphics/gpicview/Makefile                  | 8 ++------
 hungarian/hu-phone/Makefile                 | 8 ++------
 hungarian/hu-zipcodes/Makefile              | 8 ++------
 hungarian/hunspell/Makefile                 | 8 ++------
 hungarian/ispell/Makefile                   | 8 ++------
 hungarian/jdictionary-eng-hun-expr/Makefile | 6 +-----
 hungarian/jdictionary-eng-hun/Makefile      | 6 +-----
 mail/anomy-sanitizer/Makefile               | 8 ++------
 mail/lookout/Makefile                       | 8 ++------
 net-mgmt/aspathtree/Makefile                | 7 ++-----
 net-mgmt/flowd/Makefile                     | 2 +-
 net-mgmt/nagiostat/Makefile                 | 8 ++------
 net-mgmt/ndpmon/Makefile                    | 2 +-
 net-mgmt/netwag/Makefile                    | 8 ++------
 net-mgmt/netwox/Makefile                    | 8 ++------
 net-mgmt/nfdump-devel/Makefile              | 2 +-
 net-mgmt/nfdump/Makefile                    | 2 +-
 net-mgmt/nfsen/Makefile                     | 8 ++------
 net-mgmt/ramond/Makefile                    | 8 ++------
 net-mgmt/rancid-devel/Makefile              | 8 ++------
 net-mgmt/rancid/Makefile                    | 2 +-
 net-mgmt/sipcalc/Makefile                   | 8 ++------
 net-mgmt/softflowd/Makefile                 | 8 ++------
 net/aslookup/Makefile                       | 8 ++------
 net/beacon/Makefile                         | 6 +++---
 net/bindtest/Makefile                       | 8 ++------
 net/findmtu/Makefile                        | 8 ++------
 net/mad_fcl/Makefile                        | 8 ++------
 net/mgen/Makefile                           | 8 ++------
 net/netstrain/Makefile                      | 8 ++------
 net/netwib/Makefile                         | 8 ++------
 net/p5-IO-Socket-INET6/Makefile             | 8 ++------
 net/p5-IO-Socket-Multicast/Makefile         | 8 ++------
 net/rude/Makefile                           | 8 ++------
 net/slbd/Makefile                           | 8 ++------
 net/tcpreen/Makefile                        | 8 ++------
 security/apache-xml-security-c/Makefile     | 2 +-
 security/denyhosts/Makefile                 | 8 ++------
 security/doscan/Makefile                    | 8 ++------
 security/opensaml2/Makefile                 | 8 ++------
 security/tinyca/Makefile                    | 8 ++------
 sysutils/fanout/Makefile                    | 8 ++------
 textproc/jdictionary-int-eng/Makefile       | 6 +-----
 textproc/jdictionary/Makefile               | 2 +-
 textproc/xerces-c2-devel/Makefile           | 2 +-
 www/bozohttpd/Makefile                      | 2 +-
 www/limesurvey/Makefile                     | 2 +-
 www/www6to4/Makefile                        | 7 ++-----
 66 files changed, 116 insertions(+), 330 deletions(-)

diff --git a/benchmarks/blogbench/Makefile b/benchmarks/blogbench/Makefile
index 0e73f95c506c..c50f004fbd1c 100644
--- a/benchmarks/blogbench/Makefile
+++ b/benchmarks/blogbench/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	blogbench
-# Date created:			Feb 14, 2005
-# Whom:				janos.mohacsi@bsd.hu
-#
+# Created by: janos.mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	blogbench
 PORTVERSION=	1.1
@@ -11,7 +7,7 @@ CATEGORIES=	benchmarks
 MASTER_SITES=	http://download.pureftpd.org/pub/blogbench/ \
 		ftp://ftp.pureftpd.org/pub/pure-ftpd/misc/blogbench/
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Performance Test of Filesystem I/O
 
 GNU_CONFIGURE=	yes
diff --git a/comms/scmxx/Makefile b/comms/scmxx/Makefile
index b6e56bc14a87..20fdc626d5d1 100644
--- a/comms/scmxx/Makefile
+++ b/comms/scmxx/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    scmxx
-# Date created:         21.03.2002
-# Whom:                 Janos.Mohacsi@bsd.hu
-#
+# Created by: Janos.Mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	scmxx
 PORTVERSION=	0.9.0
@@ -11,7 +7,7 @@ PORTREVISION=	2
 CATEGORIES=	comms
 MASTER_SITES=	SF
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Data exchange utility for Siemens mobile phones
 
 USE_BZIP2=	yes
diff --git a/databases/p5-DBM-Deep/Makefile b/databases/p5-DBM-Deep/Makefile
index aebbc1f3f65a..45f4d17f4a0e 100644
--- a/databases/p5-DBM-Deep/Makefile
+++ b/databases/p5-DBM-Deep/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-DBM-Deep
-# Date created:		09 August 2004
-# Whom:	      		Janos.Mohacsi@bsd.hu
-#
+# Created by: Janos.Mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	DBM-Deep
 PORTVERSION=	2.0008
@@ -11,7 +7,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	A pure perl persistent multi-level hash/array DBM
 
 BUILD_DEPENDS=	p5-Clone>=0:${PORTSDIR}/devel/p5-Clone \
diff --git a/databases/rrdman/Makefile b/databases/rrdman/Makefile
index 90d520d2d011..a553b4949d93 100644
--- a/databases/rrdman/Makefile
+++ b/databases/rrdman/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	rrdman
-# Date created:		2007-06-07
-# Whom:			Janos Mohacsi <janos.mohacsi@bsd.hu>
-#
+# Created by: Janos Mohacsi <janos.mohacsi@bsd.hu>
 # $FreeBSD$
-#
 
 PORTNAME=	rrdman
 PORTVERSION=	1.0.1
@@ -11,7 +7,7 @@ PORTREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	SF/rrfw/${PORTNAME}/${PORTVERSION}
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Apply Holt-Winters prediction parameters to RRD data
 
 BUILD_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool
diff --git a/devel/p5-FileHandle-Fmode/Makefile b/devel/p5-FileHandle-Fmode/Makefile
index 1303722dc4d6..89e5378cd59d 100644
--- a/devel/p5-FileHandle-Fmode/Makefile
+++ b/devel/p5-FileHandle-Fmode/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-FileHandle-Fmode
-# Date created:		01 October 2007
-# Whom:	      		janos.mohacsi@bsd.hu
-#
+# Created by: janos.mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	FileHandle-Fmode
 PORTVERSION=	0.11
@@ -11,7 +7,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Module to determine if a filehandle is opened for reading, writing
 
 MAN3=		FileHandle::Fmode.3
diff --git a/devel/xmltooling/Makefile b/devel/xmltooling/Makefile
index 3c3bde1121c7..565d22adc460 100644
--- a/devel/xmltooling/Makefile
+++ b/devel/xmltooling/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xmltooling
-# Date created:				12 September 2008
-# Whom:					Janos Mohacsi
-#
+# Created by: Janos Mohacsi
 # $FreeBSD$
-#
 
 PORTNAME=	xmltooling
 PORTVERSION=	1.4.2
@@ -11,7 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	devel security
 MASTER_SITES=	http://www.shibboleth.net/downloads/c++-opensaml/2.4.3/
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Low level XML support for SAML
 
 LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
diff --git a/dns/dnsdoctor/Makefile b/dns/dnsdoctor/Makefile
index f6edf9d57ac9..494ce84905ef 100644
--- a/dns/dnsdoctor/Makefile
+++ b/dns/dnsdoctor/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	dnsdoctor
-# Date created:		2004-09-10
-# Whom:	      		Janos.Mohacsi@bsd.hu
-#
+# Created by: Janos.Mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	dnsdoctor
 PORTVERSION=	1.0.1
@@ -11,7 +7,7 @@ CATEGORIES=	dns ipv6 ruby
 MASTER_SITES=	http://www.dnsdoctor.org/download/src/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Perform consistency checks on DNS zones
 
 .if defined(WITH_X11)
diff --git a/dns/zonecheck/Makefile b/dns/zonecheck/Makefile
index ae301f16ca17..c8328be9526c 100644
--- a/dns/zonecheck/Makefile
+++ b/dns/zonecheck/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.zonecheck.fr/download/ \
 		ftp://ftp.nic.fr/pub/mirror/zonecheck/src/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Perform consistency checks on DNS zones
 
 LICENSE=	GPLv3
diff --git a/editors/cream/Makefile b/editors/cream/Makefile
index 001c27cdf1cb..8eca5046394a 100644
--- a/editors/cream/Makefile
+++ b/editors/cream/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cream
-# Date created:				2004-08-25
-# Whom:					Janos Mohacsi <janos.mohacsi@bsd.hu>
-#
+# Created by: Janos Mohacsi <janos.mohacsi@bsd.hu>
 # $FreeBSD$
-#
 
 PORTNAME=	cream
 PORTVERSION=	0.42
@@ -11,7 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	SF/${PORTNAME}/Cream/${PORTVERSION}
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Gvim extension with many features
 
 RUN_DEPENDS=	${LOCALBASE}/bin/gvim:${PORTSDIR}/editors/vim
diff --git a/emulators/yape/Makefile b/emulators/yape/Makefile
index 2c34e86a43d2..82e0eeddd811 100644
--- a/emulators/yape/Makefile
+++ b/emulators/yape/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    yape
-# Date created:         31.10.2002
-# Whom:                 Janos.Mohacsi@bsd.hu
-#
+# Created by: Janos.Mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	yape
 PORTVERSION=	0.32.5
@@ -12,7 +8,7 @@ CATEGORIES=	emulators
 MASTER_SITES=	http://yape.homeserver.hu/download/
 DISTNAME=	${PORTNAME}SDL-${PORTVERSION}
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Yet Another Commodore +4 Emulator
 
 USE_SDL=	sdl
diff --git a/french/jdictionary-fre-hun/Makefile b/french/jdictionary-fre-hun/Makefile
index d67e5e7e805d..1f1c02b20c38 100644
--- a/french/jdictionary-fre-hun/Makefile
+++ b/french/jdictionary-fre-hun/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    jdictionary-fre-hun
-# Date created:         20.06.2002
-# Whom:                 janos.mohacsi@bsd.hu
-#
+# Created by: janos.mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	jdictionary-fre-hun
 PORTVERSION=	1.0
diff --git a/games/bubbros/Makefile b/games/bubbros/Makefile
index 8c2813fd3837..75f0083786f6 100644
--- a/games/bubbros/Makefile
+++ b/games/bubbros/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    bub-n-bros
-# Date created:         		26 January 2005
-# Whom:                 		Janos Mohacsi <janos.mohacsi@bsd.hu>
-#
+# Created by: Janos Mohacsi <janos.mohacsi@bsd.hu>
 # $FreeBSD$
-#
 
 PORTNAME=	bubbros
 PORTVERSION=	1.6
@@ -11,7 +7,7 @@ PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	SF/bub-n-bros/bub-n-bros/${PORTVERSION}
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Multiplayer clone of the famous Bubble Bobble game
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
diff --git a/games/hohlin/Makefile b/games/hohlin/Makefile
index 9452168f65ff..c49651f60451 100644
--- a/games/hohlin/Makefile
+++ b/games/hohlin/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	hohlin
-# Date created:		2004-08-17
-# Whom:			Janos Mohacsi <janos.mohacsi@bsd.hu>
-#
+# Created by: Janos Mohacsi <janos.mohacsi@bsd.hu>
 # $FreeBSD$
-#
 
 PORTNAME=	hohlin
 PORTVERSION=	1.01
@@ -15,7 +11,7 @@ MASTER_SITES=	http://skye.ki.iif.hu/~mohacsi/downloads/
 PKGNAMEPREFIX=	linux-
 DISTNAME=	${PORTNAME}-${SHORTPORTVERSION}
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Remake of the classic spectrum game Head over Heels
 
 WRKSRC=		${WRKDIR}/hoh-install-${PORTVERSION}/
diff --git a/games/pathological/Makefile b/games/pathological/Makefile
index 5e36fd6c19f6..bc8b37fe6533 100644
--- a/games/pathological/Makefile
+++ b/games/pathological/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	pathological
-# Date created:				15 Sept 2003
-# Whom:					Janos Mohacsi <janos.mohacsi@bsd.hu>
-#
+# Created by: Janos Mohacsi <janos.mohacsi@bsd.hu>
 # $FreeBSD$
-#
 
 PORTNAME=	pathological
 PORTVERSION=	1.1.3
@@ -11,7 +7,7 @@ PORTREVISION=	6
 CATEGORIES=	games
 MASTER_SITES=	SF
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Enriched clone of the game "Logical"
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
diff --git a/games/polypuzzle/Makefile b/games/polypuzzle/Makefile
index 868e214f41d5..19fbb76d565d 100644
--- a/games/polypuzzle/Makefile
+++ b/games/polypuzzle/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	polypuzzle
-# Date created:		30 June 2004
-# Whom:			janos.mohacsi@bsd.hu
-#
+# Created by: janos.mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	polypuzzle
 PORTVERSION=	1.6
@@ -12,7 +8,7 @@ CATEGORIES=	games tcl tk
 MASTER_SITES=	ftp://ibiblio.org/pub/Linux/games/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Tessellation puzzle game
 
 RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
diff --git a/games/py-ski/Makefile b/games/py-ski/Makefile
index 3e5c195adbbd..0249080b77d3 100644
--- a/games/py-ski/Makefile
+++ b/games/py-ski/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	py-ski
-# Date created:		27 Feb 2004
-# Whom:			janos.mohacsi@bsd.hu
-#
+# Created by: janos.mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	ski
 PORTVERSION=	6.5
@@ -11,7 +7,7 @@ CATEGORIES=	games python
 MASTER_SITES=	http://catb.org/~esr/ski/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Skiing simulation with curses interface in python
 
 USE_PYTHON=	yes
diff --git a/german/jdictionary-eng-ger/Makefile b/german/jdictionary-eng-ger/Makefile
index 4ff4dcf80db1..fb02ead4317c 100644
--- a/german/jdictionary-eng-ger/Makefile
+++ b/german/jdictionary-eng-ger/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    jdictionary-eng-ger
-# Date created:         		20.12.2004
-# Whom:                 		hq@FreeBSD.org
-#
+# Created by: hq@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	jdictionary-eng-ger
 PORTVERSION=	1.4
diff --git a/german/jdictionary-ger-hun/Makefile b/german/jdictionary-ger-hun/Makefile
index 5e83a842ea64..b449fc7d0db4 100644
--- a/german/jdictionary-ger-hun/Makefile
+++ b/german/jdictionary-ger-hun/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    jdictionary-ger-hun
-# Date created:         		20.12.2004
-# Whom:                 		hq@FreeBSD.org
-#
+# Created by: hq@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	jdictionary-ger-hun
 PORTVERSION=	1.4
diff --git a/graphics/gpicview/Makefile b/graphics/gpicview/Makefile
index cbcbf8ea3711..aed4ad80a553 100644
--- a/graphics/gpicview/Makefile
+++ b/graphics/gpicview/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gpicview
-# Date created:		2007-10-05
-# Whom:			Janos Mohacsi <janos.mohacsi@bsd.hu>
-#
+# Created by: Janos Mohacsi <janos.mohacsi@bsd.hu>
 # $FreeBSD$
-#
 
 PORTNAME=	gpicview
 PORTVERSION=	0.2.1
@@ -11,7 +7,7 @@ PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	SF/lxde/GPicView%20%28image%20Viewer%29/GPicView%20${PORTVERSION}
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	A Simple and Fast Image Viewer for X
 
 USE_GNOME=	gtk20
diff --git a/hungarian/hu-phone/Makefile b/hungarian/hu-phone/Makefile
index 7c7539f11249..af9674a1e68e 100644
--- a/hungarian/hu-phone/Makefile
+++ b/hungarian/hu-phone/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Phone codes in Hungary
-# Date created:         2002-06-22
-# Whom:                 janos.mohacsi@bsd.hu
-#
+# Created by: janos.mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	phone
 PORTVERSION=	20020622
@@ -13,7 +9,7 @@ PKGNAMEPREFIX=	hu-
 DISTNAME=	korzetszam.2002.06.22
 EXTRACT_SUFX=	.gz
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Phone codes in Hungary / Magyarorszagi korzetszamok
 
 PLIST_FILES=	share/misc/hu.phone
diff --git a/hungarian/hu-zipcodes/Makefile b/hungarian/hu-zipcodes/Makefile
index 9ce4e76165d1..4fe08c34864f 100644
--- a/hungarian/hu-zipcodes/Makefile
+++ b/hungarian/hu-zipcodes/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Hungary zipcodes
-# Date created:         2002-06-22
-# Whom:                 janos.mohacsi@bsd.hu
-#
+# Created by: janos.mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	zipcodes
 PORTVERSION=	20020622
@@ -13,7 +9,7 @@ PKGNAMEPREFIX=	hu-
 DISTNAME=	iranyitoszamok.2002.06.22
 EXTRACT_SUFX=	.gz
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Postal codes in Hungary / Magyarorszagi iranyitoszamok
 
 PLIST_FILES=	share/misc/hu.zipcodes
diff --git a/hungarian/hunspell/Makefile b/hungarian/hunspell/Makefile
index 238743b58301..5a4d06301616 100644
--- a/hungarian/hunspell/Makefile
+++ b/hungarian/hunspell/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    hunspell
-# Date created:         24.07.2004
-# Whom:                 janos.mohacsi@bsd.hu
-#
+# Created by: janos.mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	hunspell
 PORTVERSION=	1.6.1
@@ -11,7 +7,7 @@ CATEGORIES=	hungarian textproc
 MASTER_SITES=	SF/magyarispell/Magyar%20Ispell/${PORTVERSION}
 DISTNAME=	hu_HU-${PORTVERSION}
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Hunspell Hungarian dictionary
 
 LICENSE=	GPLv2 LGPL21 MPL
diff --git a/hungarian/ispell/Makefile b/hungarian/ispell/Makefile
index cbf05726d7c0..e13dbeff2491 100644
--- a/hungarian/ispell/Makefile
+++ b/hungarian/ispell/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    magyarispell
-# Date created:         20.03.2002
-# Whom:                 mohacsi
-#
+# Created by: mohacsi
 # $FreeBSD$
-#
 
 PORTNAME=	ispell
 PORTVERSION=	1.6.1
@@ -12,7 +8,7 @@ CATEGORIES=	hungarian textproc
 MASTER_SITES=	SF/magyar${PORTNAME}/Magyar%20Ispell/${PORTVERSION}
 DISTNAME=	magyarispell-${PORTVERSION}
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Hungarian dictionary for ispell
 
 BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell \
diff --git a/hungarian/jdictionary-eng-hun-expr/Makefile b/hungarian/jdictionary-eng-hun-expr/Makefile
index a8eece5253df..f63470711421 100644
--- a/hungarian/jdictionary-eng-hun-expr/Makefile
+++ b/hungarian/jdictionary-eng-hun-expr/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    jdictionary-eng-hun-expr
-# Date created:         24.04.2002
-# Whom:                 janos.mohacsi@bsd.hu
-#
+# Created by: janos.mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	jdictionary-eng-hun-expr
 PORTVERSION=	1.4
diff --git a/hungarian/jdictionary-eng-hun/Makefile b/hungarian/jdictionary-eng-hun/Makefile
index 6611b4e0500c..0e525bc9d06e 100644
--- a/hungarian/jdictionary-eng-hun/Makefile
+++ b/hungarian/jdictionary-eng-hun/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    jdictionary-eng-hun
-# Date created:         23.04.2002
-# Whom:                 janos.mohacsi@bsd.hu
-#
+# Created by: janos.mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	jdictionary-eng-hun
 PORTVERSION=	1.4
diff --git a/mail/anomy-sanitizer/Makefile b/mail/anomy-sanitizer/Makefile
index ecb40a532437..0d02302b00d7 100644
--- a/mail/anomy-sanitizer/Makefile
+++ b/mail/anomy-sanitizer/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	anomy-sanitizer
-# Date created:		2003-02-11
-# Whom:			janos.mohacsi@bsd.hu
-#
+# Created by: janos.mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	anomy-sanitizer
 PORTVERSION=	1.76
@@ -11,7 +7,7 @@ PORTREVISION=	4
 CATEGORIES=	mail security
 MASTER_SITES=	http://mailtools.anomy.net/dist/
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Sanitize and clean incoming/outgoing mail
 
 USE_PERL5=	yes
diff --git a/mail/lookout/Makefile b/mail/lookout/Makefile
index cec84df46d9d..a247962935e7 100644
--- a/mail/lookout/Makefile
+++ b/mail/lookout/Makefile
@@ -1,16 +1,12 @@
-# New ports collection makefile for:	lookout
-# Date created:		12 Apr 2002
-# Whom:			janos.mohacsi@bsd.hu
-#
+# Created by: janos.mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	lookout
 PORTVERSION=	1.4
 CATEGORIES=	mail
 MASTER_SITES=	http://catb.org/~esr/lookout/
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Convert Outlook97 addressbook export files to KDE KAB/GNOME gnomecard
 
 USE_PYTHON=	yes
diff --git a/net-mgmt/aspathtree/Makefile b/net-mgmt/aspathtree/Makefile
index df406734f5d5..406f97557dc2 100644
--- a/net-mgmt/aspathtree/Makefile
+++ b/net-mgmt/aspathtree/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:    aspathtree
-# Date created:         06.05.2002
-# Whom: Janos Mohacsi <janos.mohacsi@bsd.hu>
-#
+# Created by: Janos Mohacsi <janos.mohacsi@bsd.hu>
 # $FreeBSD$
 
 PORTNAME=	aspathtree
@@ -11,7 +8,7 @@ CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	http://ipv6.niif.hu/~mohacsi/downloads/
 DISTNAME=	ASpath-tree-v${PORTVERSION}
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Checks IPv6 routes' stability and correctness on IPv6 internet
 
 RUN_DEPENDS=	p5-Net-Telnet>=0:${PORTSDIR}/net/p5-Net-Telnet \
diff --git a/net-mgmt/flowd/Makefile b/net-mgmt/flowd/Makefile
index 897155958c4a..6d32a9c51f92 100644
--- a/net-mgmt/flowd/Makefile
+++ b/net-mgmt/flowd/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	GOOGLE_CODE \
 		http://www2.mindrot.org/files/flowd/
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Small, fast, and secure NetFlow collector
 
 OPTIONS_DEFINE=	PERL PYTHON
diff --git a/net-mgmt/nagiostat/Makefile b/net-mgmt/nagiostat/Makefile
index ff427861e9b5..19e3948df07a 100644
--- a/net-mgmt/nagiostat/Makefile
+++ b/net-mgmt/nagiostat/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	nagiostat
-# Date created:			20 July 2004
-# Whom:				Janos.Mohacsi@bsd.hu
-#
+# Created by: Janos.Mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	nagiostat
 PORTVERSION=	1.0.0
@@ -12,7 +8,7 @@ CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/1.0
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Nagiostat parses performance-data from Nagios and generates graphs
 
 RUN_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool \
diff --git a/net-mgmt/ndpmon/Makefile b/net-mgmt/ndpmon/Makefile
index da4aa7982ba9..b1033c5d12dc 100644
--- a/net-mgmt/ndpmon/Makefile
+++ b/net-mgmt/ndpmon/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-1.4/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	On-link icmpv6 message monitoring and reporting daemon
 
 LICENSE=	LGPL21
diff --git a/net-mgmt/netwag/Makefile b/net-mgmt/netwag/Makefile
index ec0d87f82db6..259832e40a90 100644
--- a/net-mgmt/netwag/Makefile
+++ b/net-mgmt/netwag/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	netwag
-# Date created:				11.08.2004
-# Whom:					janos.mohacsi@bsd.hu
-#
+# Created by: janos.mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	netwag
 PORTVERSION=	5.38.0
@@ -13,7 +9,7 @@ MASTER_SITES=	http://www.laurentconstantin.com/common/netw/${PORTNAME}/download/
 		http://laurentconstantin.free.fr/common/netw/${PORTNAME}/download/v5/
 DISTFILES=	${PORTNAME}-${PORTVERSION}-src.tgz ${PORTNAME}-${PORTVERSION}-doc_html.tgz
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	A graphical front end for netwox
 
 BUILD_DEPENDS=	netwox:${PORTSDIR}/net-mgmt/netwox \
diff --git a/net-mgmt/netwox/Makefile b/net-mgmt/netwox/Makefile
index 53e397af9ccc..7e14f20e7646 100644
--- a/net-mgmt/netwox/Makefile
+++ b/net-mgmt/netwox/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	netwox
-# Date created:				26.07.2004
-# Whom:					janos.mohacsi@bsd.hu
-#
+# Created by: janos.mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	netwox
 PORTVERSION=	5.38.0
@@ -13,7 +9,7 @@ MASTER_SITES=	http://www.laurentconstantin.com/common/netw/netwox/download/v5/ \
 		http://laurentconstantin.free.fr/common/netw/netwox/download/v5/
 DISTFILES=	${PORTNAME}-${PORTVERSION}-src.tgz ${PORTNAME}-${PORTVERSION}-doc_html.tgz
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Netwox a network testing toolbox
 
 BUILD_DEPENDS=	netwib-config:${PORTSDIR}/net/netwib
diff --git a/net-mgmt/nfdump-devel/Makefile b/net-mgmt/nfdump-devel/Makefile
index d39e642a3961..0a00f61cb252 100644
--- a/net-mgmt/nfdump-devel/Makefile
+++ b/net-mgmt/nfdump-devel/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/nfdump/snapshot/nfdump-snapshot-${PORTVERSION}
 DISTNAME=	nfdump-snapshot-${PORTVERSION}
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Development version of tools to collect and process NetFlow data
 
 BUILD_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool
diff --git a/net-mgmt/nfdump/Makefile b/net-mgmt/nfdump/Makefile
index 4ecf4f47a613..1275c2a38b7c 100644
--- a/net-mgmt/nfdump/Makefile
+++ b/net-mgmt/nfdump/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.6.8
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Command-line tools to collect and process NetFlow data
 
 LICENSE=	BSD
diff --git a/net-mgmt/nfsen/Makefile b/net-mgmt/nfsen/Makefile
index b269363461da..fbc06bf14a3d 100644
--- a/net-mgmt/nfsen/Makefile
+++ b/net-mgmt/nfsen/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	nfsen
-# Date created:		25 March 2005
-# Whom:			janos.mohacsi@bsd.hu
-#
+# Created by: janos.mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	nfsen
 PORTVERSION=	1.3.6p1
@@ -11,7 +7,7 @@ CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION} \
 		http://nfsen.sourceforge.net/
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Web based frontend to nfdump netflow collector
 
 LICENSE=	BSD
diff --git a/net-mgmt/ramond/Makefile b/net-mgmt/ramond/Makefile
index 4e24474f60e4..e99b23eb6fba 100644
--- a/net-mgmt/ramond/Makefile
+++ b/net-mgmt/ramond/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	ramond
-# Date created:				2010-01-25
-# Whom:					janos.mohacsi@bsd.hu
-#
+# Created by: janos.mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	ramond
 PORTVERSION=	0.5
@@ -11,7 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/_${PORTVERSION}/
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	On-link IPv6 router advertisement monitoring and reporting daemon
 
 LICENSE=	BSD
diff --git a/net-mgmt/rancid-devel/Makefile b/net-mgmt/rancid-devel/Makefile
index 6fe35cd518e2..8fe69ef8adfd 100644
--- a/net-mgmt/rancid-devel/Makefile
+++ b/net-mgmt/rancid-devel/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	rancid-devel
-# Date created:		20 March 2007 (based on net-mgmt/rancid)
-# Whom:			janos.mohacsi@bsd.hu
-#
+# Created by: janos.mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	rancid
 PORTVERSION=	2.3.2a10
@@ -12,7 +8,7 @@ CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://ftp.shrubbery.net/pub/rancid/
 PKGNAMESUFFIX=	-devel
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Really Awesome New Cisco confIg Differ
 
 BUILD_DEPENDS=	expect:${PORTSDIR}/lang/expect-devel
diff --git a/net-mgmt/rancid/Makefile b/net-mgmt/rancid/Makefile
index ed334888e281..8ea730fc2640 100644
--- a/net-mgmt/rancid/Makefile
+++ b/net-mgmt/rancid/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	2.3.8
 CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://ftp.shrubbery.net/pub/rancid/
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Really Awesome New Cisco confIg Differ
 
 BUILD_DEPENDS=	expect:${PORTSDIR}/lang/expect-devel
diff --git a/net-mgmt/sipcalc/Makefile b/net-mgmt/sipcalc/Makefile
index 7155a6d62a57..8a5f558cc450 100644
--- a/net-mgmt/sipcalc/Makefile
+++ b/net-mgmt/sipcalc/Makefile
@@ -1,16 +1,12 @@
-# New ports collection makefile for:	sipcalc
-# Date created:				24.03.2002
-# Whom:					Janos.Mohacsi@dante.org.uk
-#
+# Created by: Janos.Mohacsi@dante.org.uk
 # $FreeBSD$
-#
 
 PORTNAME=	sipcalc
 PORTVERSION=	1.1.5
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	http://www.routemeister.net/projects/sipcalc/files/
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Sipcalc is an IP subnet calculator with IPv6 support
 
 GNU_CONFIGURE=	yes
diff --git a/net-mgmt/softflowd/Makefile b/net-mgmt/softflowd/Makefile
index b970ccd2564d..e49537ef8245 100644
--- a/net-mgmt/softflowd/Makefile
+++ b/net-mgmt/softflowd/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   flowd
-# Date created:        9 October 2004
-# Whom:                Janos Mohacsi <janos.mohacsi@bsd.hu>
-#
+# Created by: Janos Mohacsi <janos.mohacsi@bsd.hu>
 # $FreeBSD$
-#
 
 PORTNAME=	softflowd
 PORTVERSION=	0.9.8
@@ -11,7 +7,7 @@ PORTREVISION=	2
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	http://www2.mindrot.org/files/softflowd/
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Softflowd is flow-based network traffic analyser with export
 
 GNU_CONFIGURE=	yes
diff --git a/net/aslookup/Makefile b/net/aslookup/Makefile
index c2b6b58952c5..1014e3d0ff3d 100644
--- a/net/aslookup/Makefile
+++ b/net/aslookup/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	aslookup
-# Date created:				12.04.2002
-# Whom:					janos.mohacsi@bsd.hu
-#
+# Created by: janos.mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	aslookup
 PORTVERSION=	0.12
@@ -12,7 +8,7 @@ CATEGORIES=	net
 MASTER_SITES=	http://www.bugest.net/software/aslookup/
 DISTNAME=	${PORTNAME}-alpha${PORTVERSION}
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Tool that searches the sequence of AS numbers
 
 post-patch:
diff --git a/net/beacon/Makefile b/net/beacon/Makefile
index 9f369f6a503a..5be22ba75288 100644
--- a/net/beacon/Makefile
+++ b/net/beacon/Makefile
@@ -1,4 +1,4 @@
-# Created by:	Janos.Mohacsi@bsd.hu
+# Created by: Janos.Mohacsi@bsd.hu
 # $FreeBSD$
 
 PORTNAME=	beacon
@@ -7,7 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	net perl5 mbone ipv6
 MASTER_SITES=	SF/multicastbeacon/multicastbeacon/beacon%20v${PORTVERSION}
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Beacon active measurement tool to monitor multicast
 
 BUILD_DEPENDS=	p5-Net>=0:${PORTSDIR}/net/p5-Net
@@ -19,7 +19,7 @@ USE_PERL5=	yes
 USE_AUTOTOOLS=	autoconf
 
 OPTIONS_DEFINE=		IPV6
-OPTIONS_DEFAULT=	
+OPTIONS_DEFAULT=
 
 IPV6_DESC=		Enable IPv6 PTR lookups
 
diff --git a/net/bindtest/Makefile b/net/bindtest/Makefile
index 360f08e6d153..1d19fbb050c5 100644
--- a/net/bindtest/Makefile
+++ b/net/bindtest/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	bindtest
-# Date created:		2004-08-19
-# Whom:			Janos Mohacsi <janos.mohacsi@bsd.hu>
-#
+# Created by: Janos Mohacsi <janos.mohacsi@bsd.hu>
 # $FreeBSD$
-#
 
 PORTNAME=	bindtest
 PORTVERSION=	1.56
@@ -17,7 +13,7 @@ DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 IGNOREFILES=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Test bind() semantics of IPv6 sockets
 
 MAN1=		bindtest.1
diff --git a/net/findmtu/Makefile b/net/findmtu/Makefile
index 4bc910f8e1b8..28a5c5e8e752 100644
--- a/net/findmtu/Makefile
+++ b/net/findmtu/Makefile
@@ -1,16 +1,12 @@
-# New ports collection makefile for:	findmtu
-# Date created:		13 July 2004
-# Whom:			janos.mohacsi@bsd.hu
-#
+# Created by: janos.mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	findmtu
 PORTVERSION=	0.9
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.dia.uniroma3.it/~compunet/tunneldiscovery/findmtu/
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	A tool for performing IPv6 path MTU discovery on *NIX
 
 SUB_FILES=	findmtu
diff --git a/net/mad_fcl/Makefile b/net/mad_fcl/Makefile
index e4671d806da6..8639a7f5f1c8 100644
--- a/net/mad_fcl/Makefile
+++ b/net/mad_fcl/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mad_fcl
-# Date created:				03.02.2003
-# Whom:					Janos.Mohacsi@bsd.hu
-#
+# Created by: Janos.Mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	mad_fcl
 PORTVERSION=	1.3
@@ -12,7 +8,7 @@ CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.atm.tut.fi/mad/download/
 DISTNAME=	${PORTNAME}_v${PORTVERSION}_src
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	FLUTE - File Delivery over Unidirectional Transport implementation
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
diff --git a/net/mgen/Makefile b/net/mgen/Makefile
index ef7ba5500451..b5cd2e6266d2 100644
--- a/net/mgen/Makefile
+++ b/net/mgen/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	rude
-# Date created:		04/11/2004
-# Whom:			janos.mohacsi@bsd.hu
-#
+# Created by: janos.mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	mgen
 PORTVERSION=	4.2b6
@@ -14,7 +10,7 @@ MASTER_SITE_SUBDIR=	miwi
 DISTNAME=	src-${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	An IP network performance tests and measurements
 
 # Dumps core on 64-bit architectures. This was reported to the upstream
diff --git a/net/netstrain/Makefile b/net/netstrain/Makefile
index 4c20b95454c7..988d81c3f4ce 100644
--- a/net/netstrain/Makefile
+++ b/net/netstrain/Makefile
@@ -1,16 +1,12 @@
-# New ports collection makefile for:	netstrain
-# Date created:		10 July 2003
-# Whom:			Janos.Mohacsi@bsd.hu
-#
+# Created by: Janos.Mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	netstrain
 PORTVERSION=	3.0
 CATEGORIES=	net ipv6
 MASTER_SITES=	SF
 
-MAINTAINER=	Janos.Mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Tool to measure practical TCP throughput between two machines
 
 DOC_FILES=	README
diff --git a/net/netwib/Makefile b/net/netwib/Makefile
index a4a8423330ef..6e91ce01f7af 100644
--- a/net/netwib/Makefile
+++ b/net/netwib/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	netwox
-# Date created:				23.07.2004
-# Whom:					janos.mohacsi@bsd.hu
-#
+# Created by: janos.mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	netwib
 PORTVERSION=	5.38.0
@@ -13,7 +9,7 @@ MASTER_SITES=	http://www.laurentconstantin.com/common/netw/netwib/download/v5/ \
 		http://laurentconstantin.free.fr/common/netw/netwib/download/v5/
 DISTFILES=	${PORTNAME}-${PORTVERSION}-src.tgz ${PORTNAME}-${PORTVERSION}-doc_html.tgz
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Netwib network programming library
 
 BUILD_DEPENDS=	${LIBNET_CONFIG}:${PORTSDIR}/net/libnet
diff --git a/net/p5-IO-Socket-INET6/Makefile b/net/p5-IO-Socket-INET6/Makefile
index 632e8dbb3814..fa49a06a7aae 100644
--- a/net/p5-IO-Socket-INET6/Makefile
+++ b/net/p5-IO-Socket-INET6/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-IO-INET6
-# Date created:		02 July 2003
-# Whom:	      		Janos.Mohacsi@bsd.hu
-#
+# Created by: Janos.Mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	IO-Socket-INET6
 PORTVERSION=	2.69
@@ -12,7 +8,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SHLOMIF
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Perl module with object interface to AF_INET6 domain sockets
 
 BUILD_DEPENDS=	p5-Socket6>=0.12:${PORTSDIR}/net/p5-Socket6
diff --git a/net/p5-IO-Socket-Multicast/Makefile b/net/p5-IO-Socket-Multicast/Makefile
index cd855948a060..9115523abb56 100644
--- a/net/p5-IO-Socket-Multicast/Makefile
+++ b/net/p5-IO-Socket-Multicast/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-IO-Socket-Multicast
-# Date created:		21 March 2002
-# Whom:	      		Janos.Mohacsi@dante.org.uk
-#
+# Created by: Janos.Mohacsi@dante.org.uk
 # $FreeBSD$
-#
 
 PORTNAME=	IO-Socket-Multicast
 PORTVERSION=	1.12
@@ -11,7 +7,7 @@ CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Perl module to send and receive multicast messages
 
 RUN_DEPENDS=	p5-IO-Interface>=0:${PORTSDIR}/net/p5-IO-Interface
diff --git a/net/rude/Makefile b/net/rude/Makefile
index d09cc2520a4a..3625a98a3b7c 100644
--- a/net/rude/Makefile
+++ b/net/rude/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	rude
-# Date created:		rude
-# Whom:			Janos.Mohacsi@bsd.hu
-#
+# Created by: Janos.Mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	rude
 PORTVERSION=	0.70
@@ -11,7 +7,7 @@ PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	Janos.Mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Rude is a Real-time UDP Data Emitter and Collector (crude)
 
 RUN_DEPENDS=	p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
diff --git a/net/slbd/Makefile b/net/slbd/Makefile
index b86077b68682..9f7ed8f344e8 100644
--- a/net/slbd/Makefile
+++ b/net/slbd/Makefile
@@ -1,16 +1,12 @@
-# New ports collection makefile for:   slbd
-# Date created:        30 October 2006
-# Whom:                Janos Mohacsi <janos.mohacsi@bsd.hu>
-#
+# Created by: Janos Mohacsi <janos.mohacsi@bsd.hu>
 # $FreeBSD$
-#
 
 PORTNAME=	slbd
 PORTVERSION=	1.3
 CATEGORIES=	net sysutils
 MASTER_SITES=	SF
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Server load balancing daemon for *BSD pf
 
 PLIST_FILES=	sbin/slbd etc/slbdcap-sample
diff --git a/net/tcpreen/Makefile b/net/tcpreen/Makefile
index 171dc585533f..41f44283fe31 100644
--- a/net/tcpreen/Makefile
+++ b/net/tcpreen/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	tcpreen
-# Date created:				09.08.2002
-# Whom:					Janos.Mohacsi@bsd.hu
-#
+# Created by: Janos.Mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	tcpreen
 PORTVERSION=	1.4.4
@@ -11,7 +7,7 @@ PORTREVISION=	2
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.remlab.net/files/tcpreen/
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	A simple TCP session re-engineering tool
 
 USE_BZIP2=	yes
diff --git a/security/apache-xml-security-c/Makefile b/security/apache-xml-security-c/Makefile
index 313269573760..777649bdaad1 100644
--- a/security/apache-xml-security-c/Makefile
+++ b/security/apache-xml-security-c/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=santuario/c-library
 PKGNAMEPREFIX=	apache-
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Apache XML security libraries - C++ version
 
 LICENSE=	AL2
diff --git a/security/denyhosts/Makefile b/security/denyhosts/Makefile
index 42fbb7a61aa0..209efca6378c 100644
--- a/security/denyhosts/Makefile
+++ b/security/denyhosts/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    denyhosts
-# Date created:         		04 November 2005
-# Whom:                 		Janos Mohacsi <janos.mohacsi@bsd.hu>
-#
+# Created by: Janos Mohacsi <janos.mohacsi@bsd.hu>
 # $FreeBSD$
-#
 
 PORTNAME=	denyhosts
 PORTVERSION=	2.6
@@ -12,7 +8,7 @@ CATEGORIES=	security
 MASTER_SITES=	SF
 DISTNAME=	DenyHosts-${PORTVERSION}
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Script to thwart ssh attacks
 
 USE_PYTHON=	yes
diff --git a/security/doscan/Makefile b/security/doscan/Makefile
index 4ef71c78401b..6b83354e3e27 100644
--- a/security/doscan/Makefile
+++ b/security/doscan/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	doscan
-# Date created:		24 Sept 2003
-# Whom:			Janos.Mohacsi@bsd.hu
-#
+# Created by: Janos.Mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	doscan
 PORTVERSION=	0.3.1
@@ -11,7 +7,7 @@ PORTREVISION=	3
 CATEGORIES=	security net
 MASTER_SITES=	http://static.enyo.de/fw/releases/doscan/
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Tool to quickly scan your network for machines listening on a TCP port
 
 LIB_DEPENDS=	pcre.3:${PORTSDIR}/devel/pcre
diff --git a/security/opensaml2/Makefile b/security/opensaml2/Makefile
index a0c10e5d7ad6..82259491df15 100644
--- a/security/opensaml2/Makefile
+++ b/security/opensaml2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	opensaml2
-# Date created:				15 September 2008
-# Whom:					Janos Mohacsi
-#
+# Created by: Janos Mohacsi
 # $FreeBSD$
-#
 
 PORTNAME=	opensaml2
 PORTVERSION=	2.4.3
@@ -12,7 +8,7 @@ CATEGORIES=	security
 MASTER_SITES=	http://www.shibboleth.net/downloads/c++-opensaml/${PORTVERSION}/
 DISTNAME=	opensaml-${PORTVERSION}
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Open source implementation of SAML2
 
 LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl \
diff --git a/security/tinyca/Makefile b/security/tinyca/Makefile
index 54496e23220e..bdabee6f94c9 100644
--- a/security/tinyca/Makefile
+++ b/security/tinyca/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	tinyca
-# Date created:				17 July 2003
-# Whom:					Janos.Mohacsi@bsd.hu
-#
+# Created by: Janos.Mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	tinyca
 PORTVERSION=	0.7.5
@@ -13,7 +9,7 @@ MASTER_SITES=	http://tinyca.sm-zone.net/ \
 		http://tinyca.sm-zone.net/old/
 DISTNAME=	${PORTNAME}2-${PORTVERSION}
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Simple graphical interface to manage a small Certification Authority
 
 RUN_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
diff --git a/sysutils/fanout/Makefile b/sysutils/fanout/Makefile
index e7e01d1a87a1..f984b9a8e575 100644
--- a/sysutils/fanout/Makefile
+++ b/sysutils/fanout/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	fanout
-# Date created:				20.01.2005
-# Whom:					janos.mohacsi@bsd.hu
-#
+# Created by: janos.mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	fanout
 PORTVERSION=	0.6.1
@@ -12,7 +8,7 @@ MASTER_SITES=	http://www.stearns.org/fanout/ \
 		ftp://ftp.bascom.com/pub/wstearns/fanout/ \
 		http://www.linuxgrill.com/anonymous/mirrors/wstearns/fanout/
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Tool to run commands on multiple machines
 
 USE_PERL5_RUN=	yes
diff --git a/textproc/jdictionary-int-eng/Makefile b/textproc/jdictionary-int-eng/Makefile
index aa42bb0f909a..1edfce17aa57 100644
--- a/textproc/jdictionary-int-eng/Makefile
+++ b/textproc/jdictionary-int-eng/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    jdictionary-int-eng
-# Date created:         20.06.2002
-# Whom:                 janos.mohacsi@bsd.hu
-#
+# Created by: janos.mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	jdictionary-int-eng
 PORTVERSION=	1.0
diff --git a/textproc/jdictionary/Makefile b/textproc/jdictionary/Makefile
index 0beaa1e6c237..8b562cb4ee07 100644
--- a/textproc/jdictionary/Makefile
+++ b/textproc/jdictionary/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	textproc java
 MASTER_SITES=	SF/jdictionary/jDictionary/jDictionary%20version%20${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION:S,.,_,}
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Platform independent, plugin based dictionary
 
 RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
diff --git a/textproc/xerces-c2-devel/Makefile b/textproc/xerces-c2-devel/Makefile
index 01d9f028211d..7fc04422b97a 100644
--- a/textproc/xerces-c2-devel/Makefile
+++ b/textproc/xerces-c2-devel/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	xerces/c/sources
 DISTNAME=	xerces-c-src_${PORTVERSION:S/./_/g}
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Validating XML parser from the Apache XML Project
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/www/bozohttpd/Makefile b/www/bozohttpd/Makefile
index 432c9c1c7350..b042a90dbf64 100644
--- a/www/bozohttpd/Makefile
+++ b/www/bozohttpd/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.eterna.com.au/bozohttpd/ \
 		${MASTER_SITE_NETBSD}
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	The bozotic HTTP server
 
 LICENSE=	BSD
diff --git a/www/limesurvey/Makefile b/www/limesurvey/Makefile
index f28b9461704d..e0d1419dec49 100644
--- a/www/limesurvey/Makefile
+++ b/www/limesurvey/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/1._LimeSurvey_stable/${PORTVERSION}+/
 DISTNAME=	${PORTNAME}${PORTVERSION:S^.^^}plus-build10232-20110608
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	A PHP-based survey building and runing system
 
 LICENSE=	GPLv2
diff --git a/www/www6to4/Makefile b/www/www6to4/Makefile
index 13121279e70d..3b2de0c61673 100644
--- a/www/www6to4/Makefile
+++ b/www/www6to4/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:    www6to4
-# Date created:         22.03.2002
-# Whom: Janos Mohacsi <janos.mohacsi@dante.org.uk>
-#
+# Created by: Janos Mohacsi <janos.mohacsi@dante.org.uk>
 # $FreeBSD$
 
 PORTNAME=	www6to4
@@ -10,7 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	ftp://ftp.pasta.cs.uit.no/pub/Vermicelli/
 
-MAINTAINER=	janos.mohacsi@bsd.hu
+MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Lightweight http proxy to help IPv4 only browsers
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/./-/}