"aaargh, quoted Makefile variables"

Approved by:	portmgr (bapt)

42 files changed, 78 insertions, 217 deletions

diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile
index 1acc7da4571c..4ea94c17b35b 100644
--- a/audio/tracker/Makefile
+++ b/audio/tracker/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	tracker
-# Date created:		2 Oct 1994
-# Whom:			swallace
-#
+# Created by: swallace
 # $FreeBSD$
-#
 
 PORTNAME=	tracker
 PORTVERSION=	5.3
@@ -14,7 +10,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MOD player
 
-RESTRICTED=	"Non-redistributable beta"
+RESTRICTED=	Non-redistributable beta
 
 LATEST_LINK=	tracker-player
 WRKSRC=		${WRKDIR}/tracker
diff --git a/chinese/msttf/Makefile b/chinese/msttf/Makefile
index 0887324eb4c2..f2ac03ca8b21 100644
--- a/chinese/msttf/Makefile
+++ b/chinese/msttf/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Microsoft Windows Chinese TrueType fonts
-# Date created:		28 Feb 2004
-# Whom:			LI Dong <ld@FreeBSD.org.cn>
-#
+# Created by: LI Dong <ld@FreeBSD.org.cn>
 # $FreeBSD$
-#
 
 PORTNAME=	msttf
 PORTVERSION=	1.0
@@ -24,7 +20,7 @@ MSTTF_SIMSUN=	simsun.ttc
 MSTTF_TAHOMA=	tahoma.ttf
 
 IGNOREFILES=	${MSTTF_SIMHEI} ${MSTTF_SIMSUN} ${MSTTF_TAHOMA}
-RESTRICTED=	"Redistribution of pre-compiled binaries is not permitted"
+RESTRICTED=	Redistribution of pre-compiled binaries is not permitted
 
 NO_BUILD=	yes
 SHAREMODE=	644
diff --git a/deskutils/xmdiary/Makefile b/deskutils/xmdiary/Makefile
index 38f946c343fe..1fc520ca8be1 100644
--- a/deskutils/xmdiary/Makefile
+++ b/deskutils/xmdiary/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xmdiary
-# Date created:		29 Sep 1997
-# Whom:			mi@aldan.ziplink.net
-#
+# Created by: mi@aldan.ziplink.net
 # $FreeBSD$
-#
 
 PORTNAME=	xmdiary
 PORTVERSION=	3.0.3
@@ -16,7 +12,7 @@ DISTFILES=	${DISTNAME}.tar.gz
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Personal and group calendar utility
 
-NO_CDROM=	"Don't sell for profit"
+NO_CDROM=	Don't sell for profit
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 USE_MOTIF=	yes
 USE_IMAKE=	yes
diff --git a/editors/edith/Makefile b/editors/edith/Makefile
index 32dc44eb5e9a..1b35dbfdd941 100644
--- a/editors/edith/Makefile
+++ b/editors/edith/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    edith
-# Date created:         8 February 2002
-# Whom:                 Christian Brueffer <chris@unixpages.org>
-#
+# Created by: Christian Brueffer <chris@unixpages.org>
 # $FreeBSD$
-#
 
 PORTNAME=	edith
 PORTVERSION=	1.58
@@ -20,7 +16,7 @@ ONLY_FOR_ARCHS=	i386
 USE_LINUX=	yes
 USE_LINUX_APPS=	xorglibs
 
-RESTRICTED=	"Redistribution not allowed"
+RESTRICTED=	Redistribution not allowed
 NO_BUILD=	yes
 
 MAN1=		edith.1
diff --git a/editors/uzap/Makefile b/editors/uzap/Makefile
index 5130f1a278ec..36098be64cbf 100644
--- a/editors/uzap/Makefile
+++ b/editors/uzap/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	uzap
-# Date created:		19 Jun 1995
-# Whom:			joerg
-#
+# Created by: joerg
 # $FreeBSD$
-#
 
 PORTNAME=	uzap
 PORTVERSION=	1.0
@@ -15,7 +11,7 @@ MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	Visual binary file editor
 
 # restrictive Copyright; the author is no longer reachable, however :-(
-RESTRICTED=	"Restrictive copyright"
+RESTRICTED=	Restrictive copyright
 NO_WRKSUBDIR=	yes
 MAN1=		uzap.1
 PLIST_FILES=	bin/uzap
diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index c4d8cf1d07c8..819acdc974de 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Atari 8-bit computer emulator
 BUILD_DEPENDS=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
 LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
-RESTRICTED=	"xf25 contains copyright ROMs and cannot be distributed."
+RESTRICTED=	xf25 contains copyright ROMs and cannot be distributed.
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index ba42dd4a25e2..5be6b584cea6 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 LIB_DEPENDS+=	Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
 .endif
 
-RESTRICTED=	"ROMs are copyrighted by Commodore Business Machines"
+RESTRICTED=	ROMs are copyrighted by Commodore Business Machines
 LICENSE=	GPLv2
 
 USE_XORG=	xpm ice sm xext xv xt x11 xmu
diff --git a/games/ladder/Makefile b/games/ladder/Makefile
index 8766d005da60..aaf12a758681 100644
--- a/games/ladder/Makefile
+++ b/games/ladder/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   ladder
-# Date created:        18 Feb 1998
-# Whom:                Stefan Zehl <sec@42.org>
-#
+# Created by: Stefan Zehl <sec@42.org>
 # $FreeBSD$
-#
 
 PORTNAME=	ladder
 PORTVERSION=	1.00
@@ -16,7 +12,7 @@ DISTFILES=	ladder.tar
 MAINTAINER=	sec@42.org
 COMMENT=	The old "ladder" game
 
-RESTRICTED=	"possible copyright problems ?"
+RESTRICTED=	possible copyright problems ?
 
 NO_WRKSUBDIR=	true
 EXTRACT_CMD=		${TAR}
diff --git a/games/xinvaders/Makefile b/games/xinvaders/Makefile
index 43c7050adc38..3a4a0b66d793 100644
--- a/games/xinvaders/Makefile
+++ b/games/xinvaders/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    xinvaders
-# Date created:         3 Jan 1995
-# Whom:                 swallace
-#
+# Created by: swallace
 # $FreeBSD$
-#
 
 PORTNAME=	xinvaders
 PORTVERSION=	2.1.1
@@ -17,7 +13,7 @@ COMMENT=	Shoot-em-up them nasty little bugs
 
 ONLY_FOR_ARCHS=	i386
 
-NO_CDROM=	"don't sell for profit"
+NO_CDROM=	don't sell for profit
 
 USE_GETTEXT=	yes
 USE_XORG=	x11 xmu xaw xt
diff --git a/games/xrisk/Makefile b/games/xrisk/Makefile
index b2cbc337f6c7..56c8764fc855 100644
--- a/games/xrisk/Makefile
+++ b/games/xrisk/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    xrisk
-# Date created:		4 Jan 1995
-# Whom:			swallace
-#
+# Created by: swallace
 # $FreeBSD$
-#
 
 PORTNAME=	xrisk
 PORTVERSION=	2.15
@@ -18,6 +14,6 @@ USE_IMAKE=	yes
 USE_XORG=	x11 xext xt
 MAN6=		xrisk.6
 
-RESTRICTED=	"Possible trademark infringement"
+RESTRICTED=	Possible trademark infringement
 
 .include <bsd.port.mk>
diff --git a/games/xskat/Makefile b/games/xskat/Makefile
index 3ab92664f857..6dd05734bdc2 100644
--- a/games/xskat/Makefile
+++ b/games/xskat/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xskat
-# Date created:		27 Apr 1996
-# Whom:			Thomas Gellekum <tg@FreeBSD.org>
-#
+# Created by: Thomas Gellekum <tg@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xskat
 PORTVERSION=	4.0
@@ -17,7 +13,7 @@ COMMENT=	Play the card game Skat
 
 .if defined(WITH_ALTENBURGER_CARDS)
 DISTFILES+=	xskat-cards.tar.gz
-RESTRICTED=	"The altenburger card file is NOT freely redistributable!"
+RESTRICTED=	The altenburger card file is NOT freely redistributable!
 .endif
 
 USE_IMAKE=	yes
diff --git a/games/xtris/Makefile b/games/xtris/Makefile
index 00d2ada72e19..5ef176a8a0a1 100644
--- a/games/xtris/Makefile
+++ b/games/xtris/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    xtris
-# Date created:         24. Sep 97
-# Whom:                 sec@42.org
-#
+# Created by: sec@42.org
 # $FreeBSD$
-#
 
 PORTNAME=	xtris
 PORTVERSION=	1.15
@@ -19,7 +15,7 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	sec@42.org
 COMMENT=	A multi-player version of a popular game for the X Window system
 
-RESTRICTED=	"Possible trademark infringement"
+RESTRICTED=	Possible trademark infringement
 WRKSRC=		${WRKDIR}/xtris
 USE_XORG=	x11 xext
 
diff --git a/graphics/giftool/Makefile b/graphics/giftool/Makefile
index 62de15e830e2..8d42662e928a 100644
--- a/graphics/giftool/Makefile
+++ b/graphics/giftool/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   giftool
-# Date created:        14 October 1996
-# Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
-#
+# Created by: Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 # $FreeBSD$
-#
 
 PORTNAME=	giftool
 PORTVERSION=	1.0
@@ -15,7 +11,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tool for GIF89a transparent option and interlace mode
 
-NO_CDROM=	"Shareware"
+NO_CDROM=	Shareware
 
 NO_WRKSUBDIR=	yes
 ALL_TARGET=	giftool
diff --git a/graphics/linux-adobesvg/Makefile b/graphics/linux-adobesvg/Makefile
index 585816d49bc2..5f222607b236 100644
--- a/graphics/linux-adobesvg/Makefile
+++ b/graphics/linux-adobesvg/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	linux-adobesvg
-# Date created:				18 Feb 2006
-# Whom:					Jean-Yves Lefort <jylefort@FreeBSD.org>
-#
+# Created by: Jean-Yves Lefort <jylefort@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	linux-adobesvg
 DISTVERSION=	3.01x88
@@ -19,7 +15,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX=	yes
 USE_LINUX_APPS=	xorglibs
 
-RESTRICTED=	"Redistribution prohibited"
+RESTRICTED=	Redistribution prohibited
 NO_BUILD=	yes
 
 LIBDIR=		${PREFIX}/lib/linux-adobesvg
diff --git a/graphics/uDrawGraph/Makefile b/graphics/uDrawGraph/Makefile
index 4c5225b2ff41..1f8430ed6f5c 100644
--- a/graphics/uDrawGraph/Makefile
+++ b/graphics/uDrawGraph/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	uDrawGraph
-# Date created:		2005-10-05
-# Whom:			Nicola Vitale	<nivit@email.it>
-#
+# Created by: Nicola Vitale	<nivit@email.it>
 # $FreeBSD$
-#
 
 PORTNAME=	uDrawGraph
 PORTVERSION=	3.1.1
@@ -31,7 +27,7 @@ LICENSES=	LICENSE.txt LIZENZ.txt
 
 LINK_OPTS=	-sf
 
-RESTRICTED=	"binary under GNU LGPL without accompanying source"
+RESTRICTED=	binary under GNU LGPL without accompanying source
 
 do-install:
 # licenses required at startup
diff --git a/japanese/eijiro-fpw/Makefile b/japanese/eijiro-fpw/Makefile
index 0b7b0a499780..2a8ea8022443 100644
--- a/japanese/eijiro-fpw/Makefile
+++ b/japanese/eijiro-fpw/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	EIJIRO Dictionary - JIS X 4081 version
-# Date created:        	2000.11.28
-# Whom:			Satoshi Taoka <taoka@FreeBSD.org>
-#
+# Created by: Satoshi Taoka <taoka@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	eijiro-fpw
 PORTVERSION=	1.0b
@@ -20,7 +16,7 @@ BUILD_DEPENDS=	${LOCALBASE}/libexec/freepwing/catdump:${PORTSDIR}/japanese/freep
 		ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode
 
 MANUAL_PACKAGE_BUILD=Needs data from CDROM
-RESTRICTED=	"The original dictionary is not free"
+RESTRICTED=	The original dictionary is not free
 USE_GMAKE=	yes
 USE_PERL5=	yes
 WRKSRC=		${WRKDIR}/eijiro-fpw${PORTVERSION}
diff --git a/japanese/mikachan-ttfonts/Makefile b/japanese/mikachan-ttfonts/Makefile
index 858b0c54a996..502bb20ca655 100644
--- a/japanese/mikachan-ttfonts/Makefile
+++ b/japanese/mikachan-ttfonts/Makefile
@@ -1,10 +1,5 @@
-# New ports collection makefile for:	TrueTypeFont Mika-chan
-# Date created:		12 October 2002
-# Whom:			sada
-# Based on:		KANOU Hiroki's kochi-ttfonts
-#
+# Created by: sada
 # $FreeBSD$
-#
 
 PORTNAME=	mikachan-ttfonts
 PORTVERSION=	8.7
@@ -23,7 +18,7 @@ EXTRACT_DEPENDS=	lha:${PORTSDIR}/archivers/lha
 
 BROKEN=		checksum mismatch
 
-NO_CDROM=	"Don't sell distfile"
+NO_CDROM=	Don't sell distfile
 EXTRACT_CMD=	lha
 EXTRACT_BEFORE_ARGS=	pq
 EXTRACT_AFTER_ARGS=	> ${WRKSRC}/mika.ttf
diff --git a/japanese/mypaedia-fpw/Makefile b/japanese/mypaedia-fpw/Makefile
index c8736b56e601..00c8da81aee0 100644
--- a/japanese/mypaedia-fpw/Makefile
+++ b/japanese/mypaedia-fpw/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mypaedia - JIS X 4081 format version
-# Date created:        	00/02/21
-# Whom:			Satoshi Taoka <taoka@FreeBSD.org>
-#
+# Created by: Satoshi Taoka <taoka@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	mypaedia-fpw
 PORTVERSION=	1.4.3
@@ -19,7 +15,7 @@ BUILD_DEPENDS=	fpwmake:${PORTSDIR}/japanese/freepwing \
 		ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode
 
 IS_INTERACTIVE= YES
-RESTRICTED=	"The original dictionary is not free"
+RESTRICTED=	The original dictionary is not free
 USE_PERL5=	yes
 WRKSRC=		${WRKDIR}/mypaedia-fpw${PORTVERSION}
 DICT_PATH?=	/cdrom
diff --git a/japanese/srd-fpw/Makefile b/japanese/srd-fpw/Makefile
index 8db5ed52e7d1..9bb9abc4843d 100644
--- a/japanese/srd-fpw/Makefile
+++ b/japanese/srd-fpw/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	srd - JIS X 4081 format version
-# Date created:        	00/06/14
-# Whom:			Satoshi Taoka <taoka@FreeBSD.org>
-#
+# Created by: Satoshi Taoka <taoka@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	srd-fpw
 PORTVERSION=	1.1.5
@@ -19,7 +15,7 @@ BUILD_DEPENDS=	fpwmake:${PORTSDIR}/japanese/freepwing \
 		ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode
 
 IS_INTERACTIVE= YES
-RESTRICTED=	"The original dictionary is not free"
+RESTRICTED=	The original dictionary is not free
 USE_PERL5=	yes
 WRKSRC=		${WRKDIR}/srd-fpw${PORTVERSION}
 DICT_PATH?=	/cdrom
diff --git a/japanese/waeijiro-fpw/Makefile b/japanese/waeijiro-fpw/Makefile
index 3cd3e719f206..3394043f6dd8 100644
--- a/japanese/waeijiro-fpw/Makefile
+++ b/japanese/waeijiro-fpw/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	WAEIJIRO Dictionary - JIS X 4081 version
-# Date created:        	2002.9.9
-# Whom:			Satoshi Taoka <taoka@FreeBSD.org>
-#
+# Created by: Satoshi Taoka <taoka@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	waeijiro-fpw
 PORTVERSION=	1.1
@@ -21,7 +17,7 @@ BUILD_DEPENDS=	${LOCALBASE}/libexec/freepwing/catdump:${PORTSDIR}/japanese/freep
 		ja-p5-Jcode>=0:${PORTSDIR}/japanese/p5-Jcode
 
 MANUAL_PACKAGE_BUILD=Needs data from a CDROM
-RESTRICTED=	"The original dictionary is not free"
+RESTRICTED=	The original dictionary is not free
 USE_GMAKE=	yes
 USE_PERL5=	yes
 DICT_PATH?=	/cdrom
diff --git a/japanese/yasou-fpw/Makefile b/japanese/yasou-fpw/Makefile
index 457b18074c39..b0585a69d4be 100644
--- a/japanese/yasou-fpw/Makefile
+++ b/japanese/yasou-fpw/Makefile
@@ -1,10 +1,5 @@
-# New ports collection makefile for:	Yasou picture book - JIS X 4081 version
-# Date created:        	2004.11.08
-# Whom:			Hideyuki KURASHINA <rushani@FreeBSD.org>
-# Based on:		Satoshi Taoka's roget-fpw
-#
+# Created by: Hideyuki KURASHINA <rushani@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	yasou-fpw
 PORTVERSION=	1.0.b0
@@ -15,7 +10,7 @@ DISTNAME=	${PORTNAME}${PORTVERSION:S/.b0/beta0/}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Yasou picture book (EPWING V1 format) by SAS
 
-NO_CDROM=	"No commercial use, and no redistribution allowed with fee except media and/or shipping cost"
+NO_CDROM=	No commercial use, and no redistribution allowed with fee except media and/or shipping cost
 
 USE_ZIP=	yes
 NO_BUILD=	yes
diff --git a/java/cos/Makefile b/java/cos/Makefile
index 14835ae50c05..c738fa1bcbce 100644
--- a/java/cos/Makefile
+++ b/java/cos/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cos
-# Date created:		1999/07/05
-# Whom:			Jose Marques <noway@nohow.demon.co.uk>
-#
+# Created by: Jose Marques <noway@nohow.demon.co.uk>
 # $FreeBSD$
-#
 
 PORTNAME=	cos
 PORTVERSION=	2002.11.05
@@ -21,7 +17,7 @@ USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 USE_JAVA=	yes
 NO_BUILD=	yes
-RESTRICTED=	"Special conditions apply for commercial use, see licence"
+RESTRICTED=	Special conditions apply for commercial use, see licence
 DATAFILES=	readme.txt license.txt doc
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
diff --git a/java/infobus/Makefile b/java/infobus/Makefile
index 1410d520df5d..067e02a6240a 100644
--- a/java/infobus/Makefile
+++ b/java/infobus/Makefile
@@ -16,7 +16,7 @@ JAVA_VERSION=	1.6+
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-NO_CDROM=	"See the license"
+NO_CDROM=	See the license
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
diff --git a/java/j2sdkee13/Makefile b/java/j2sdkee13/Makefile
index 31fd819337e8..2c2c736a323a 100644
--- a/java/j2sdkee13/Makefile
+++ b/java/j2sdkee13/Makefile
@@ -15,8 +15,8 @@ JAVA_VERSION=	1.6+
 
 NO_BUILD=	YES
 
-RESTRICTED=	"Redistribution is not permitted"
-NO_CDROM=	"Redistribution is not permitted"
+RESTRICTED=	Redistribution is not permitted
+NO_CDROM=	Redistribution is not permitted
 
 J2SDKEEVERSION=	${PORTVERSION}_02
 DOWNLOAD_URL?=	http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=7917-j2ee_sdk-1.3.1-oth-JPR&SiteId=JSC&TransactionId=noreg
@@ -34,4 +34,3 @@ do-install:
 	(cd ${WRKDIR} && ${TAR} cf - ${PORTNAME}${PORTVERSION} |\
 		${TAR} xf - -C ${PREFIX})
 
-.include <bsd.port.post.mk>
diff --git a/java/jai/Makefile b/java/jai/Makefile
index 68be4c85ac4c..da832a607c5d 100644
--- a/java/jai/Makefile
+++ b/java/jai/Makefile
@@ -21,7 +21,7 @@ SUB_FILES=	pkg-message
 SUB_LIST=	TARGET_DIR=${TARGET_DIR}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-RESTRICTED=	"Redistribution is not permitted"
+RESTRICTED=	Redistribution is not permitted
 
 DOWNLOAD_URL=	http://java.sun.com/products/java-media/jai/current.html
 
diff --git a/lang/ifc/Makefile b/lang/ifc/Makefile
index ffc87f873f33..bc520a50a02b 100644
--- a/lang/ifc/Makefile
+++ b/lang/ifc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    ifc
-# Date created:         Oct 30, 2001
-# Whom:                 NAKATA Maho <maho@FreeBSD.org>
-#
+# Created by: NAKATA Maho <maho@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	ifc
 PORTVERSION=	8.1.034
@@ -23,7 +19,7 @@ PATCH_DEPENDS=		${LINUX_BASE_PORT}
 
 EXTRACT_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 
-RESTRICTED=	"Intel forbids any redistribution"
+RESTRICTED=	Intel forbids any redistribution
 
 ONLY_FOR_ARCHS=		i386
 CONFLICTS=		linux_devtools*
diff --git a/math/triangle/Makefile b/math/triangle/Makefile
index 2447cf7891ea..df10c321b5bd 100644
--- a/math/triangle/Makefile
+++ b/math/triangle/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:  triangle
-# Date created:               16 Octobre 2004
-# Whom:                       Thierry Thomas <thierry@pompo.net>
-#
+# Created by: Thierry Thomas <thierry@pompo.net>
 # $FreeBSD$
-#
 
 PORTNAME=	triangle
 PORTVERSION=	1.6
@@ -17,7 +13,7 @@ DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	A Two-Dimensional Quality Mesh Generator and Delaunay Triangulator
 
-NO_CDROM=	"Triangle must not be sold for profit"
+NO_CDROM=	Triangle must not be sold for profit
 
 NO_WRKSUBDIR=	yes
 USE_ZIP=	yes
diff --git a/math/xgobi/Makefile b/math/xgobi/Makefile
index 7b497d91b831..905dd6f9109b 100644
--- a/math/xgobi/Makefile
+++ b/math/xgobi/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xgobi
-# Date created:				5 December 2001
-# Whom:					Tony Maher <tonym@biolateral.com.au>
-#
+# Created by: Tony Maher <tonym@biolateral.com.au>
 # $FreeBSD$
-#
 
 PORTNAME=	xgobi
 PORTVERSION=	2002.06.20
@@ -16,7 +12,7 @@ EXTRACT_SUFX=	.sh.gz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical data visualisation tool
 
-NO_CDROM=	"Restrictive copyright (do not sell for profit)"
+NO_CDROM=	Restrictive copyright (do not sell for profit)
 
 PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}/src
 CONFIGURE_WRKSRC=	${PATCH_WRKSRC}
diff --git a/misc/susv2/Makefile b/misc/susv2/Makefile
index 7336839ce211..7434237ae36a 100644
--- a/misc/susv2/Makefile
+++ b/misc/susv2/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	susv2
-# Date created:		11 April 2002
-# Whom:			Simon 'corecode' Schubert <corecode@corecode.ath.cx>
-#
+# Created by: Simon 'corecode' Schubert <corecode@corecode.ath.cx>
 # $FreeBSD$
-#
 
 PORTNAME=	susv2
 PORTVERSION=	1.0
@@ -14,7 +10,7 @@ DISTNAME=	susv2
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Single UNIX Specification Version 2
 
-RESTRICTED=	"Redistribution of the documents is not permitted"
+RESTRICTED=	Redistribution of the documents is not permitted
 
 USE_BZIP2=	yes
 NO_BUILD=	yes
diff --git a/misc/susv3/Makefile b/misc/susv3/Makefile
index e5baa7355c92..3bf21e674223 100644
--- a/misc/susv3/Makefile
+++ b/misc/susv3/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	susv3
-# Date created:		11 April 2002
-# Whom:			Simon 'corecode' Schubert <corecode@corecode.ath.cx>
-#
+# Created by: Simon 'corecode' Schubert <corecode@corecode.ath.cx>
 # $FreeBSD$
-#
 
 PORTNAME=	susv3
 PORTVERSION=	1.2
@@ -14,7 +10,7 @@ DISTNAME=	susv3
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Single UNIX Specification Version 3
 
-RESTRICTED=	"Redistribution of the documents is not permitted"
+RESTRICTED=	Redistribution of the documents is not permitted
 
 USE_BZIP2=	yes
 NO_BUILD=	yes
diff --git a/multimedia/pvr250/Makefile b/multimedia/pvr250/Makefile
index f987e63e7fb5..b5fbb5e3ca2c 100644
--- a/multimedia/pvr250/Makefile
+++ b/multimedia/pvr250/Makefile
@@ -1,10 +1,5 @@
-#
-# New ports collection makefile for:	pvr250
-# Date created:				10 October 2004
-# Whom:					Edwin Groothuis <edwin@mavetju.org>
-#
+# Created by: Edwin Groothuis <edwin@mavetju.org>
 # $FreeBSD$
-#
 
 PORTNAME=	pvr250
 PORTVERSION=	20101010
@@ -26,7 +21,7 @@ WRKSRC=		${WRKDIR}
 NOFETCHFILES=	hcwPVRP2.sys
 
 RESTRICTED_FILES=	hcwPVRP2.sys
-RESTRICTED=	"This port uses a binary driver which is owned by Hauppauge"
+RESTRICTED=	This port uses a binary driver which is owned by Hauppauge
 
 MAN4=		cxm.4
 MAN1=		pvr250-setchannel.1
diff --git a/net/radiator/Makefile b/net/radiator/Makefile
index a339ce63937a..9d5ceae7fb28 100644
--- a/net/radiator/Makefile
+++ b/net/radiator/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	radiator
-# Date created:				05 March 2003
-# Whom:					shan
-#
+# Created by: shan
 # $FreeBSD$
-#
 
 PORTNAME=	Radiator
 PORTVERSION=	4.7
@@ -21,7 +17,7 @@ MYSQL_DESC=	MySQL support
 
 PERL_CONFIGURE=	yes
 
-RESTRICTED=	"Commercial software"
+RESTRICTED=	Commercial software
 
 .include <bsd.port.pre.mk>
 
diff --git a/news/dnews/Makefile b/news/dnews/Makefile
index 087db83babb0..6cdbddb65720 100644
--- a/news/dnews/Makefile
+++ b/news/dnews/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	dnews
-# Date created:		Thu May 29 17:16:36 CEST 1997
-# Whom:			Andreas Klemm <andreas@klemm.gtn.com>
-#
+# Created by: Andreas Klemm <andreas@klemm.gtn.com>
 # $FreeBSD$
-#
 
 PORTNAME=	dnews
 PORTVERSION=	5.7b1
@@ -17,7 +13,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Commercial nntp server with enhancements over inn and cnews
 
 WRKSRC=		${WRKDIR}/dtemp
-RESTRICTED=	"only free for non-profit organisations"
+RESTRICTED=	only free for non-profit organisations
 IS_INTERACTIVE=	yes
 ONLY_FOR_ARCHS=	i386
 NO_BUILD=	yes
diff --git a/security/l0phtcrack/Makefile b/security/l0phtcrack/Makefile
index 6388bee08036..cf124e9ed2fc 100644
--- a/security/l0phtcrack/Makefile
+++ b/security/l0phtcrack/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cracks SAMBA or Windows NT passwords
 
 DOCDIR=		share/doc/${PORTNAME}
-RESTRICTED=	"uses GNU getopt with BSDish-licensed code from OpenSSL"
+RESTRICTED=	uses GNU getopt with BSDish-licensed code from OpenSSL
 NO_WRKSUBDIR=	yes
 PLIST=		${WRKDIR}/pkg-plist
 USE_PERL5_BUILD=yes
diff --git a/security/tripwire-131/Makefile b/security/tripwire-131/Makefile
index 2c4c57d458ee..dfd9ab33f08c 100644
--- a/security/tripwire-131/Makefile
+++ b/security/tripwire-131/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	tripwire 1.3.1
-# Date created:		Fri Mar 19 18:29:18 1999
-# Whom:			Cy Schubert <Cy.Schubert@uumail.gov.bc.ca>
-#
+# Created by: Cy Schubert <Cy.Schubert@uumail.gov.bc.ca>
 # $FreeBSD$
-#
 
 PORTNAME=	tripwire
 PORTVERSION=	1.3.1
@@ -18,8 +14,8 @@ COMMENT=	File system security and verification program
 LATEST_LINK=	tripwire-131
 MAN5=		tw.config.5
 MAN8=		siggen.8 tripwire.8
-NO_CDROM=	"cannot be redistributed for more than the cost of duplication"
-NO_PACKAGE=	"requires local database to be built"
+NO_CDROM=	cannot be redistributed for more than the cost of duplication
+NO_PACKAGE=	requires local database to be built
 WRKSRC=		${WRKDIR}/tw_ASR_1.3.1_src
 
 TWCONFIG?=	${FILESDIR}/tw.conf.freebsd2
diff --git a/sysutils/contool/Makefile b/sysutils/contool/Makefile
index 3d1647ee0128..285827eb00c9 100644
--- a/sysutils/contool/Makefile
+++ b/sysutils/contool/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    contool
-# Date created:         2 Dec 1996
-# Whom:                 nsayer@quack.kfu.com
-#
+# Created by: nsayer@quack.kfu.com
 # $FreeBSD$
-#
 
 PORTNAME=	contool
 PORTVERSION=	3.3a
@@ -17,7 +13,7 @@ COMMENT=	Console tool for openlook
 
 LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview
 
-NO_CDROM=	"source code cannot be sold, nor can you incorporate the source code into a product which is subsequently sold"
+NO_CDROM=	source code cannot be sold, nor can you incorporate the source code into a product which is subsequently sold
 NO_WRKSUBDIR=	yes
 USE_IMAKE=	yes
 USE_XORG=	x11 xext
diff --git a/sysutils/daemontools53/Makefile b/sysutils/daemontools53/Makefile
index 2f5e6f90ad87..4f06949b71ee 100644
--- a/sysutils/daemontools53/Makefile
+++ b/sysutils/daemontools53/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	daemontools
-# Date created:		09 June 1998
-# Whom:			Dom Mitchell <dom@happygiraffe.net>
-#
+# Created by: Dom Mitchell <dom@happygiraffe.net>
 # $FreeBSD$
-#
 
 PORTNAME=	daemontools
 PORTVERSION=	0.53
@@ -14,7 +10,7 @@ MASTER_SITES=	http://cr.yp.to/daemontools/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Service monitoring and logging utilities by djb
 
-RESTRICTED=	"Unsure of djb\'s license"
+RESTRICTED=	Unsure of djb's license
 NO_LATEST_LINK=	yes
 
 ALL_TARGET=	it man
diff --git a/sysutils/linux-afaapps/Makefile b/sysutils/linux-afaapps/Makefile
index 6c81a5251ff9..be686c1339d0 100644
--- a/sysutils/linux-afaapps/Makefile
+++ b/sysutils/linux-afaapps/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	linux-afaapps
-# Date created:				6 October 2003
-# Whom:					bms@FreeBSD.org
-#
+# Created by: bms@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=		afaapps
 PORTVERSION=		2.7
@@ -17,7 +13,7 @@ DIST_SUBDIR=		rpm
 MAINTAINER=		ports@FreeBSD.org
 COMMENT=		DELL PowerEdge Raid Controller 2 (apps)
 
-RESTRICTED=		"binary redistribution license needs clarification"
+RESTRICTED=		binary redistribution license needs clarification
 
 USE_LINUX_RPM=	yes
 USE_LINUX_APPS=	arts
diff --git a/www/webcopy/Makefile b/www/webcopy/Makefile
index 24b0303121b4..cc613af2948c 100644
--- a/www/webcopy/Makefile
+++ b/www/webcopy/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    webcopy
-# Date created:         14 Sep 1996
-# Whom:                 ache
-#
+# Created by: ache
 # $FreeBSD$
-#
 
 PORTNAME=	webcopy
 PORTVERSION=	0.98b7
@@ -14,7 +10,7 @@ MASTER_SITE_SUBDIR=	cy
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	A Web Mirroring Program
 
-RESTRICTED=	"This program cannot be distributed if modified in any way.  Don't sell for profit without written permission"
+RESTRICTED=	This program cannot be distributed if modified in any way.  Don't sell for profit without written permission
 ALL_TARGET=
 
 do-install:
diff --git a/x11-fonts/cyberbit-ttfonts/Makefile b/x11-fonts/cyberbit-ttfonts/Makefile
index e54004fdd5c3..cfb182794b93 100644
--- a/x11-fonts/cyberbit-ttfonts/Makefile
+++ b/x11-fonts/cyberbit-ttfonts/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:    cyberbit-ttf
-# Date created:                         20 Feb 2005
-# Whom:                                 NAKATA, Maho <maho@FreeBSD.org>
-#
+# Created by: NAKATA, Maho <maho@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	cyberbit-ttfonts
@@ -22,7 +19,7 @@ EXTRACT_ONLY=	Cyberbit.ZIP
 MAINTAINER=	maho@FreeBSD.org
 COMMENT=	Bitstream Cyberbit is a TrueType font covers Unicode 2.0
 
-RESTRICTED=	"Redistribution not permitted; single user license only."
+RESTRICTED=	Redistribution not permitted; single user license only.
 
 USE_ZIP=	yes
 NO_BUILD=	yes
diff --git a/x11-fonts/freefonts/Makefile b/x11-fonts/freefonts/Makefile
index be2b6c1586e1..73e97d2820da 100644
--- a/x11-fonts/freefonts/Makefile
+++ b/x11-fonts/freefonts/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A collection of ATM fonts (not all free) from the CICA archives
 
 BUILD_DEPENDS=	type1inst:${PORTSDIR}/x11-fonts/p5-type1inst
 
-RESTRICTED=	"see accompanying .license files"
+RESTRICTED=	see accompanying .license files
 NO_WRKSUBDIR=	yes
 
 do-build:
diff --git a/x11-fonts/sharefonts/Makefile b/x11-fonts/sharefonts/Makefile
index dcb465ee8c3d..86069ab7255d 100644
--- a/x11-fonts/sharefonts/Makefile
+++ b/x11-fonts/sharefonts/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/fonts/
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	A collection of shareware ATM fonts from the CICA archives
 
-RESTRICTED=	"Shareware.  Cannot be distributed w/o prior authorization."
+RESTRICTED=	Shareware.  Cannot be distributed w/o prior authorization.
 
 NO_BUILD=	yes