Convert COMMENT to COMMENTFILE until these ports can be converted.

Submitted by:	lioux

87 files changed, 87 insertions, 87 deletions

diff --git a/astro/setiathome/Makefile b/astro/setiathome/Makefile
index 9e1fa82b48f8..fe733200773c 100644
--- a/astro/setiathome/Makefile
+++ b/astro/setiathome/Makefile
@@ -72,7 +72,7 @@ MD5_FILE=	${MASTERDIR}/distinfo.${ARCH}
 PKGNAMEPREFIX=	${PORT_OSNAME}-
 PKGNAMESUFFIX=	-${PORT_CPU}
 MD5_FILE=	${.CURDIR}/distinfo
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 DESCR=		${.CURDIR}/pkg-descr
 .if ${PORT_OSNAME} == linux
 .if !exists(${LINUXBASE}/usr/X11R6/lib/libXaw.so.7)
diff --git a/chinese/irssi/Makefile b/chinese/irssi/Makefile
index 4f34437aefdf..8c2e8ab7cd11 100644
--- a/chinese/irssi/Makefile
+++ b/chinese/irssi/Makefile
@@ -21,4 +21,4 @@ MAINTAINER=	vanilla@FreeBSD.org
 .include "${MASTERDIR}/Makefile"
 
 PKGNAMEPREFIX:= ${PKGNAMEPREFIX}tw-
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
diff --git a/chinese/links/Makefile b/chinese/links/Makefile
index 2f14fe0a58c9..66ee09e6448a 100644
--- a/chinese/links/Makefile
+++ b/chinese/links/Makefile
@@ -25,4 +25,4 @@ pre-configure:
 .include "${MASTERDIR}/Makefile"
 PKGNAMEPREFIX:= ${PKGNAMEPREFIX}tw-
 
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
diff --git a/chinese/nvi-big5/Makefile b/chinese/nvi-big5/Makefile
index 8f4e95df1a6e..b65482e51bdf 100644
--- a/chinese/nvi-big5/Makefile
+++ b/chinese/nvi-big5/Makefile
@@ -12,7 +12,7 @@ MASTERDIR=	${.CURDIR}/../../editors/nvi-m17n
 
 MAINTAINER=	ports@freebsd.org
 
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 CONFIGURE_ARGS+=	--enable-multibyte=big5 --program-prefix=n
 
 .include "${MASTERDIR}/Makefile"
diff --git a/chinese/nvi-euc-cn/Makefile b/chinese/nvi-euc-cn/Makefile
index c265f6222b00..5b6992362d37 100644
--- a/chinese/nvi-euc-cn/Makefile
+++ b/chinese/nvi-euc-cn/Makefile
@@ -13,6 +13,6 @@ MAINTAINER=	ports@freebsd.org
 CONFIGURE_ARGS+=	--enable-multibyte=euc-cn --program-prefix=n
 
 MASTERDIR=	${.CURDIR}/../../editors/nvi-m17n
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 
 .include "${MASTERDIR}/Makefile"
diff --git a/chinese/nvi-euc-tw/Makefile b/chinese/nvi-euc-tw/Makefile
index 92e4ea8f3c43..56c8c20f1849 100644
--- a/chinese/nvi-euc-tw/Makefile
+++ b/chinese/nvi-euc-tw/Makefile
@@ -13,6 +13,6 @@ MAINTAINER=	ports@freebsd.org
 CONFIGURE_ARGS+=	--enable-multibyte=euc-tw --program-prefix=n
 
 MASTERDIR=	${.CURDIR}/../../editors/nvi-m17n
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 
 .include "${MASTERDIR}/Makefile"
diff --git a/chinese/xemacs21/Makefile b/chinese/xemacs21/Makefile
index fab60b68f673..26511b8778b2 100644
--- a/chinese/xemacs21/Makefile
+++ b/chinese/xemacs21/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	chinese editors
 
 MAINTAINER=	keith@FreeBSD.org
 
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 PLIST=		${.CURDIR}/pkg-plist
 PKGMESSAGE=	${.CURDIR}/pkg-message
 
diff --git a/converters/mule-ucs-emacs20/Makefile b/converters/mule-ucs-emacs20/Makefile
index 1a92b874bcef..d7b0a3a9c937 100644
--- a/converters/mule-ucs-emacs20/Makefile
+++ b/converters/mule-ucs-emacs20/Makefile
@@ -13,6 +13,6 @@ MASTERDIR=	${.CURDIR}/../../converters/mule-ucs
 
 EMACS_PORT_NAME=	emacs20
 
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 
 .include <${MASTERDIR}/Makefile>
diff --git a/databases/mysql323-client/Makefile b/databases/mysql323-client/Makefile
index b5f3065ac95f..0070533bc9c9 100644
--- a/databases/mysql323-client/Makefile
+++ b/databases/mysql323-client/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	mysql-client
 PORTREVISION=	0
 
 MASTERDIR=	${.CURDIR}/../mysql323-server
-COMMENT=	${PKGDIR}/pkg-comment.client
+COMMENTFILE=	${PKGDIR}/pkg-comment.client
 PKGINSTALL=	mustnotexist
 PLIST=		${PKGDIR}/pkg-plist.client
 
diff --git a/editors/ooodict-all/Makefile b/editors/ooodict-all/Makefile
index 1d80cae4de0f..74b6db375206 100644
--- a/editors/ooodict-all/Makefile
+++ b/editors/ooodict-all/Makefile
@@ -49,7 +49,7 @@ PKGNAMESUFFIX=	-${LANGSUFFIX}
 .endif
 
 .if exists(${.CURDIR}/pkg-comment)
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 .endif
 
 .if exists(${.CURDIR}/pkg-descr)
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile
index 8084bc9ff31e..f480c726f8a4 100644
--- a/editors/openoffice-1.0/Makefile
+++ b/editors/openoffice-1.0/Makefile
@@ -51,7 +51,7 @@ LANG_EXT=01
 # Add pkg-comment and pkg-descr if available
 #
 .if exists(${.CURDIR}/pkg-comment)
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 .endif
 .if exists(${.CURDIR}/pkg-descr)
 DESCR=	${.CURDIR}/pkg-descr
diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index 6a1020390cdb..24a20e6a5bcd 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -51,7 +51,7 @@ LANG_EXT=01
 # Add pkg-comment and pkg-descr if available
 #
 .if exists(${.CURDIR}/pkg-comment)
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 .endif
 .if exists(${.CURDIR}/pkg-descr)
 DESCR=	${.CURDIR}/pkg-descr
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
index 6a1020390cdb..24a20e6a5bcd 100644
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/Makefile
@@ -51,7 +51,7 @@ LANG_EXT=01
 # Add pkg-comment and pkg-descr if available
 #
 .if exists(${.CURDIR}/pkg-comment)
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 .endif
 .if exists(${.CURDIR}/pkg-descr)
 DESCR=	${.CURDIR}/pkg-descr
diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index 6a1020390cdb..24a20e6a5bcd 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -51,7 +51,7 @@ LANG_EXT=01
 # Add pkg-comment and pkg-descr if available
 #
 .if exists(${.CURDIR}/pkg-comment)
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 .endif
 .if exists(${.CURDIR}/pkg-descr)
 DESCR=	${.CURDIR}/pkg-descr
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 6a1020390cdb..24a20e6a5bcd 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -51,7 +51,7 @@ LANG_EXT=01
 # Add pkg-comment and pkg-descr if available
 #
 .if exists(${.CURDIR}/pkg-comment)
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 .endif
 .if exists(${.CURDIR}/pkg-descr)
 DESCR=	${.CURDIR}/pkg-descr
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 6a1020390cdb..24a20e6a5bcd 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -51,7 +51,7 @@ LANG_EXT=01
 # Add pkg-comment and pkg-descr if available
 #
 .if exists(${.CURDIR}/pkg-comment)
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 .endif
 .if exists(${.CURDIR}/pkg-descr)
 DESCR=	${.CURDIR}/pkg-descr
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 6a1020390cdb..24a20e6a5bcd 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -51,7 +51,7 @@ LANG_EXT=01
 # Add pkg-comment and pkg-descr if available
 #
 .if exists(${.CURDIR}/pkg-comment)
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 .endif
 .if exists(${.CURDIR}/pkg-descr)
 DESCR=	${.CURDIR}/pkg-descr
diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
index 8084bc9ff31e..f480c726f8a4 100644
--- a/editors/openoffice.org-1.0/Makefile
+++ b/editors/openoffice.org-1.0/Makefile
@@ -51,7 +51,7 @@ LANG_EXT=01
 # Add pkg-comment and pkg-descr if available
 #
 .if exists(${.CURDIR}/pkg-comment)
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 .endif
 .if exists(${.CURDIR}/pkg-descr)
 DESCR=	${.CURDIR}/pkg-descr
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index 6a1020390cdb..24a20e6a5bcd 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -51,7 +51,7 @@ LANG_EXT=01
 # Add pkg-comment and pkg-descr if available
 #
 .if exists(${.CURDIR}/pkg-comment)
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 .endif
 .if exists(${.CURDIR}/pkg-descr)
 DESCR=	${.CURDIR}/pkg-descr
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index 6a1020390cdb..24a20e6a5bcd 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -51,7 +51,7 @@ LANG_EXT=01
 # Add pkg-comment and pkg-descr if available
 #
 .if exists(${.CURDIR}/pkg-comment)
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 .endif
 .if exists(${.CURDIR}/pkg-descr)
 DESCR=	${.CURDIR}/pkg-descr
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 6a1020390cdb..24a20e6a5bcd 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -51,7 +51,7 @@ LANG_EXT=01
 # Add pkg-comment and pkg-descr if available
 #
 .if exists(${.CURDIR}/pkg-comment)
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 .endif
 .if exists(${.CURDIR}/pkg-descr)
 DESCR=	${.CURDIR}/pkg-descr
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 6a1020390cdb..24a20e6a5bcd 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -51,7 +51,7 @@ LANG_EXT=01
 # Add pkg-comment and pkg-descr if available
 #
 .if exists(${.CURDIR}/pkg-comment)
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 .endif
 .if exists(${.CURDIR}/pkg-descr)
 DESCR=	${.CURDIR}/pkg-descr
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index 6a1020390cdb..24a20e6a5bcd 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -51,7 +51,7 @@ LANG_EXT=01
 # Add pkg-comment and pkg-descr if available
 #
 .if exists(${.CURDIR}/pkg-comment)
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 .endif
 .if exists(${.CURDIR}/pkg-descr)
 DESCR=	${.CURDIR}/pkg-descr
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index 6a1020390cdb..24a20e6a5bcd 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -51,7 +51,7 @@ LANG_EXT=01
 # Add pkg-comment and pkg-descr if available
 #
 .if exists(${.CURDIR}/pkg-comment)
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 .endif
 .if exists(${.CURDIR}/pkg-descr)
 DESCR=	${.CURDIR}/pkg-descr
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 6a1020390cdb..24a20e6a5bcd 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -51,7 +51,7 @@ LANG_EXT=01
 # Add pkg-comment and pkg-descr if available
 #
 .if exists(${.CURDIR}/pkg-comment)
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 .endif
 .if exists(${.CURDIR}/pkg-descr)
 DESCR=	${.CURDIR}/pkg-descr
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 6a1020390cdb..24a20e6a5bcd 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -51,7 +51,7 @@ LANG_EXT=01
 # Add pkg-comment and pkg-descr if available
 #
 .if exists(${.CURDIR}/pkg-comment)
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 .endif
 .if exists(${.CURDIR}/pkg-descr)
 DESCR=	${.CURDIR}/pkg-descr
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 6a1020390cdb..24a20e6a5bcd 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -51,7 +51,7 @@ LANG_EXT=01
 # Add pkg-comment and pkg-descr if available
 #
 .if exists(${.CURDIR}/pkg-comment)
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 .endif
 .if exists(${.CURDIR}/pkg-descr)
 DESCR=	${.CURDIR}/pkg-descr
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 6a1020390cdb..24a20e6a5bcd 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -51,7 +51,7 @@ LANG_EXT=01
 # Add pkg-comment and pkg-descr if available
 #
 .if exists(${.CURDIR}/pkg-comment)
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 .endif
 .if exists(${.CURDIR}/pkg-descr)
 DESCR=	${.CURDIR}/pkg-descr
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 6a1020390cdb..24a20e6a5bcd 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -51,7 +51,7 @@ LANG_EXT=01
 # Add pkg-comment and pkg-descr if available
 #
 .if exists(${.CURDIR}/pkg-comment)
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 .endif
 .if exists(${.CURDIR}/pkg-descr)
 DESCR=	${.CURDIR}/pkg-descr
diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile
index 8084bc9ff31e..f480c726f8a4 100644
--- a/editors/openoffice/Makefile
+++ b/editors/openoffice/Makefile
@@ -51,7 +51,7 @@ LANG_EXT=01
 # Add pkg-comment and pkg-descr if available
 #
 .if exists(${.CURDIR}/pkg-comment)
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 .endif
 .if exists(${.CURDIR}/pkg-descr)
 DESCR=	${.CURDIR}/pkg-descr
diff --git a/editors/vim6+ruby/Makefile b/editors/vim6+ruby/Makefile
index 6337d652533e..162a3552a73f 100644
--- a/editors/vim6+ruby/Makefile
+++ b/editors/vim6+ruby/Makefile
@@ -14,7 +14,7 @@ PKGNAMESUFFIX=	+ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 
 #EXTRA_PATCHES=	${.CURDIR}/files/patch-*
 
diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile
index fc54202c39c6..39309a1b3c6f 100644
--- a/emulators/xmess/Makefile
+++ b/emulators/xmess/Makefile
@@ -11,7 +11,7 @@ PORTVERSION=	0.61.1
 MAINTAINER=	stijn@win.tue.nl
 
 MASTERDIR=	${.CURDIR}/../xmame
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 DESCR=		${.CURDIR}/pkg-descr
 
 MAMEMESS=	mess
diff --git a/emulators/xpinmame/Makefile b/emulators/xpinmame/Makefile
index 644f0c7b0dda..a3b05ca65764 100644
--- a/emulators/xpinmame/Makefile
+++ b/emulators/xpinmame/Makefile
@@ -14,7 +14,7 @@ PATCHFILES+=	${DISTNAME}-pinmame-${PINMAMEVERSION}.patch.gz
 MAINTAINER=	stijn@win.tue.nl
 
 MASTERDIR=	${.CURDIR}/../xmame
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 DESCR=		${.CURDIR}/pkg-descr
 
 MAMEMESS=	pinmame
diff --git a/graphics/gnomecanvas/Makefile b/graphics/gnomecanvas/Makefile
index 24ee37d1b124..6f7b62fae443 100644
--- a/graphics/gnomecanvas/Makefile
+++ b/graphics/gnomecanvas/Makefile
@@ -10,7 +10,7 @@ CATEGORIES=	graphics gnome
 
 MASTERDIR=	${.CURDIR}/../gdk-pixbuf
 
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
diff --git a/japanese/epic4/Makefile b/japanese/epic4/Makefile
index 39724ac73c40..31bdab43c222 100644
--- a/japanese/epic4/Makefile
+++ b/japanese/epic4/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	knu@FreeBSD.org
 
 MASTERDIR=	${.CURDIR}/../../irc/epic4
 
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 DESCR=		${.CURDIR}/pkg-descr
 EXTRA_PATCHES=	${.CURDIR}/files/patch-*
 
diff --git a/japanese/ewipe/Makefile b/japanese/ewipe/Makefile
index 6e4c9043808e..6b98d472390b 100644
--- a/japanese/ewipe/Makefile
+++ b/japanese/ewipe/Makefile
@@ -8,7 +8,7 @@
 CATEGORIES=	japanese
 
 MASTERDIR=	${.CURDIR}/../../misc/ewipe
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 
 KANJI=		yes
 
diff --git a/japanese/exmh2/Makefile b/japanese/exmh2/Makefile
index a6bb4c16e601..7d5c88b73fd8 100644
--- a/japanese/exmh2/Makefile
+++ b/japanese/exmh2/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	ports@FreeBSD.org
 JAPANESE_EXMH=	yes
 
 MASTERDIR=	${.CURDIR}/../../mail/exmh2
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 DESCR=		${.CURDIR}/pkg-descr
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 
diff --git a/japanese/gqmpeg/Makefile b/japanese/gqmpeg/Makefile
index fe873c762c39..adc18e240f5e 100644
--- a/japanese/gqmpeg/Makefile
+++ b/japanese/gqmpeg/Makefile
@@ -14,7 +14,7 @@ EXTRA_PATCHES=	${.CURDIR}/files/extra-patch-*
 .endif
 
 MASTERDIR=	${.CURDIR}/../../audio/gqmpeg
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 DESCR=		${.CURDIR}/pkg-descr
 
 CONFIGURE_ARGS=	--enable-japanese
diff --git a/japanese/jpilot/Makefile b/japanese/jpilot/Makefile
index 6c8d279695b4..e76d229dad5a 100644
--- a/japanese/jpilot/Makefile
+++ b/japanese/jpilot/Makefile
@@ -6,7 +6,7 @@
 #
 
 MASTERDIR=	${.CURDIR}/../../palm/jpilot
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 
 CATEGORIES=	japanese
 
diff --git a/japanese/magicpoint/Makefile b/japanese/magicpoint/Makefile
index 762b793cb968..ccd158e44ee9 100644
--- a/japanese/magicpoint/Makefile
+++ b/japanese/magicpoint/Makefile
@@ -6,7 +6,7 @@
 #
 
 MASTERDIR=	${.CURDIR}/../../misc/magicpoint
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 
 LIB_DEPENDS=	VFlib2.24:${PORTSDIR}/japanese/vflib
 
diff --git a/japanese/nethack34/Makefile b/japanese/nethack34/Makefile
index 7a0a365ebde5..fef3891ae3b6 100644
--- a/japanese/nethack34/Makefile
+++ b/japanese/nethack34/Makefile
@@ -16,7 +16,7 @@ MASTERDIR=	${.CURDIR}/../../games/nethack34
 FILESDIR=	${.CURDIR}/files
 PATCHDIR=	${.CURDIR}/files
 MD5_FILE=	${.CURDIR}/distinfo
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
diff --git a/japanese/ng-canna/Makefile b/japanese/ng-canna/Makefile
index fb16d49647f8..fe1a97c78a56 100644
--- a/japanese/ng-canna/Makefile
+++ b/japanese/ng-canna/Makefile
@@ -8,7 +8,7 @@
 PKGNAMESUFFIX=	-canna
 
 MASTERDIR=	${.CURDIR}/../ng
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 DESCR=		${.CURDIR}/pkg-descr
 
 LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/Canna
diff --git a/japanese/nvi-euc-jp/Makefile b/japanese/nvi-euc-jp/Makefile
index 05d226a505fc..b12353a235d8 100644
--- a/japanese/nvi-euc-jp/Makefile
+++ b/japanese/nvi-euc-jp/Makefile
@@ -8,7 +8,7 @@
 PKGNAMESUFFIX=	-eucjp
 
 MASTERDIR=	${.CURDIR}/../../editors/nvi-m17n
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 
 LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/Canna
 
diff --git a/japanese/nvi-iso-2022-jp/Makefile b/japanese/nvi-iso-2022-jp/Makefile
index 0a3430f63132..45898a7a2fe8 100644
--- a/japanese/nvi-iso-2022-jp/Makefile
+++ b/japanese/nvi-iso-2022-jp/Makefile
@@ -8,7 +8,7 @@
 PKGNAMESUFFIX=	-iso2022jp
 
 MASTERDIR=	${.CURDIR}/../../editors/nvi-m17n
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 
 LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/Canna
 
diff --git a/japanese/nvi-sjis/Makefile b/japanese/nvi-sjis/Makefile
index fdf482b96cb3..77d175dd5888 100644
--- a/japanese/nvi-sjis/Makefile
+++ b/japanese/nvi-sjis/Makefile
@@ -8,7 +8,7 @@
 PKGNAMESUFFIX=	-sjis
 
 MASTERDIR=	${.CURDIR}/../../editors/nvi-m17n
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 
 LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/Canna
 
diff --git a/japanese/ruby-slang/Makefile b/japanese/ruby-slang/Makefile
index e08a39073b37..4531460da728 100644
--- a/japanese/ruby-slang/Makefile
+++ b/japanese/ruby-slang/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	japanese
 
 MAINTAINER=	knu@FreeBSD.org
 
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 
 WITH_JAPANESE=	yes
 
diff --git a/japanese/skk-jisyo-cdb/Makefile b/japanese/skk-jisyo-cdb/Makefile
index 66939af4131f..fbea0d261ad4 100644
--- a/japanese/skk-jisyo-cdb/Makefile
+++ b/japanese/skk-jisyo-cdb/Makefile
@@ -16,7 +16,7 @@ SKK_JISYO_SUFFIX=	.cdb
 MASTERDIR=	${.CURDIR}/../skk-jisyo
 
 MD5_FILE=	${.CURDIR}/distinfo
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 DESCR=		${.CURDIR}/pkg-descr
 
 .include "${MASTERDIR}/Makefile"
diff --git a/japanese/xemacs-devel-canna+freewnn/Makefile b/japanese/xemacs-devel-canna+freewnn/Makefile
index 21fe8de4b0ac..14fb846c236f 100644
--- a/japanese/xemacs-devel-canna+freewnn/Makefile
+++ b/japanese/xemacs-devel-canna+freewnn/Makefile
@@ -8,7 +8,7 @@
 CATEGORIES=	japanese
 
 MASTERDIR=	${.CURDIR}/../../editors/xemacs-devel-mule
-COMMENT=	${.CURDIR}/../../japanese/xemacs-devel-canna+freewnn/pkg-comment
+COMMENTFILE=	${.CURDIR}/../../japanese/xemacs-devel-canna+freewnn/pkg-comment
 
 CANNA=		yes
 FREEWNN=	yes
diff --git a/japanese/xemacs-devel-canna+wnn6/Makefile b/japanese/xemacs-devel-canna+wnn6/Makefile
index 5d1c23c73fee..d9f7135460d2 100644
--- a/japanese/xemacs-devel-canna+wnn6/Makefile
+++ b/japanese/xemacs-devel-canna+wnn6/Makefile
@@ -8,7 +8,7 @@
 CATEGORIES=	japanese
 
 MASTERDIR=	${.CURDIR}/../../editors/xemacs-devel-mule
-COMMENT=	${.CURDIR}/../../japanese/xemacs-devel-canna+wnn6/pkg-comment
+COMMENTFILE=	${.CURDIR}/../../japanese/xemacs-devel-canna+wnn6/pkg-comment
 
 CANNA=		yes
 WNN6=		yes
diff --git a/japanese/xemacs-devel-canna/Makefile b/japanese/xemacs-devel-canna/Makefile
index fdd6917580b0..85cd934b5723 100644
--- a/japanese/xemacs-devel-canna/Makefile
+++ b/japanese/xemacs-devel-canna/Makefile
@@ -8,7 +8,7 @@
 CATEGORIES=	japanese
 
 MASTERDIR=	${.CURDIR}/../../editors/xemacs-devel-mule
-COMMENT=	${.CURDIR}/../../japanese/xemacs-devel-canna/pkg-comment
+COMMENTFILE=	${.CURDIR}/../../japanese/xemacs-devel-canna/pkg-comment
 
 CANNA=		yes
 
diff --git a/japanese/xemacs-devel-freewnn/Makefile b/japanese/xemacs-devel-freewnn/Makefile
index 477ba154081a..531732f1d0d4 100644
--- a/japanese/xemacs-devel-freewnn/Makefile
+++ b/japanese/xemacs-devel-freewnn/Makefile
@@ -8,7 +8,7 @@
 CATEGORIES=	japanese
 
 MASTERDIR=	${.CURDIR}/../../editors/xemacs-devel-mule
-COMMENT=	${.CURDIR}/../../japanese/xemacs-devel-freewnn/pkg-comment
+COMMENTFILE=	${.CURDIR}/../../japanese/xemacs-devel-freewnn/pkg-comment
 
 FREEWNN=	yes
 
diff --git a/japanese/xemacs-devel-wnn6/Makefile b/japanese/xemacs-devel-wnn6/Makefile
index a958b5c0cdfe..0e77470cd89d 100644
--- a/japanese/xemacs-devel-wnn6/Makefile
+++ b/japanese/xemacs-devel-wnn6/Makefile
@@ -8,7 +8,7 @@
 CATEGORIES=	japanese
 
 MASTERDIR=	${.CURDIR}/../../editors/xemacs-devel-mule
-COMMENT=	${.CURDIR}/../../japanese/xemacs-devel-wnn6/pkg-comment
+COMMENTFILE=	${.CURDIR}/../../japanese/xemacs-devel-wnn6/pkg-comment
 
 WNN6=		yes
 
diff --git a/japanese/xemacs21-canna+freewnn/Makefile b/japanese/xemacs21-canna+freewnn/Makefile
index bea2f942ea81..4674f346e7a6 100644
--- a/japanese/xemacs21-canna+freewnn/Makefile
+++ b/japanese/xemacs21-canna+freewnn/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-COMMENT=		${.CURDIR}/pkg-comment
+COMMENTFILE=		${.CURDIR}/pkg-comment
 
 XEMACS_MAJOR_VER=	21
 CANNA=			yes
diff --git a/japanese/xemacs21-canna+wnn6/Makefile b/japanese/xemacs21-canna+wnn6/Makefile
index 5fd7df668062..f501d5b48825 100644
--- a/japanese/xemacs21-canna+wnn6/Makefile
+++ b/japanese/xemacs21-canna+wnn6/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-COMMENT=		${.CURDIR}/pkg-comment
+COMMENTFILE=		${.CURDIR}/pkg-comment
 
 XEMACS_MAJOR_VER=	21
 CANNA=			yes
diff --git a/japanese/xemacs21-canna/Makefile b/japanese/xemacs21-canna/Makefile
index 777c380c7514..a1f12c66a45b 100644
--- a/japanese/xemacs21-canna/Makefile
+++ b/japanese/xemacs21-canna/Makefile
@@ -27,7 +27,7 @@ CATEGORIES=	japanese
 
 MANLANG=	ja
 MAN1=		xemacs-ja.1
-COMMENT?=	${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-canna/pkg-comment
+COMMENTFILE?=	${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-canna/pkg-comment
 DESCR=		${.CURDIR}/../xemacs${XEMACS_MAJOR_VER}-canna/pkg-descr
 
 XEMACS_MAJOR_VER?=	21
diff --git a/japanese/xemacs21-wnn6/Makefile b/japanese/xemacs21-wnn6/Makefile
index a6b804a7a6df..5743f19cc616 100644
--- a/japanese/xemacs21-wnn6/Makefile
+++ b/japanese/xemacs21-wnn6/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-COMMENT=		${.CURDIR}/pkg-comment
+COMMENTFILE=		${.CURDIR}/pkg-comment
 
 XEMACS_MAJOR_VER=	21
 WNN6=			yes
diff --git a/japanese/xvi-euc/Makefile b/japanese/xvi-euc/Makefile
index 98cada3b2035..d5d81f195f73 100644
--- a/japanese/xvi-euc/Makefile
+++ b/japanese/xvi-euc/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 MASTERDIR=	${.CURDIR}/../xvi-euc
 
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 PLIST=		${.CURDIR}/pkg-plist
 
 PROG=		xvi
diff --git a/japanese/xvi-sjis/Makefile b/japanese/xvi-sjis/Makefile
index c05259a0f9fa..e998bfbf5fb4 100644
--- a/japanese/xvi-sjis/Makefile
+++ b/japanese/xvi-sjis/Makefile
@@ -15,7 +15,7 @@ PATCHDIR=	${.CURDIR}/files
 
 EXTRA_PATCHES=	${MASTERDIR}/files/patch-unix.h
 
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 PLIST=		${.CURDIR}/pkg-plist
 
 PROG=		sxvi
diff --git a/korean/nvi-euc-kr/Makefile b/korean/nvi-euc-kr/Makefile
index f425461138ba..bfdf8edb28b9 100644
--- a/korean/nvi-euc-kr/Makefile
+++ b/korean/nvi-euc-kr/Makefile
@@ -8,7 +8,7 @@
 PKGNAMESUFFIX=	-euckr
 
 MASTERDIR=	${.CURDIR}/../../editors/nvi-m17n
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 
 CATEGORIES=	korean editors
 
diff --git a/korean/nvi-iso-2022-kr/Makefile b/korean/nvi-iso-2022-kr/Makefile
index 487c486eaade..aa715cd56fff 100644
--- a/korean/nvi-iso-2022-kr/Makefile
+++ b/korean/nvi-iso-2022-kr/Makefile
@@ -8,7 +8,7 @@
 PKGNAMESUFFIX=	-iso2022kr
 
 MASTERDIR=	${.CURDIR}/../../editors/nvi-m17n
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 
 CATEGORIES=	korean editors
 
diff --git a/lang/php3/Makefile b/lang/php3/Makefile
index 237985ea4ebb..aff32eafa487 100644
--- a/lang/php3/Makefile
+++ b/lang/php3/Makefile
@@ -10,7 +10,7 @@ PORTREVISION=	1
 CATEGORIES=	lang
 
 MASTERDIR=	${.CURDIR}/../../www/mod_php3
-COMMENT=	${PKGDIR}/pkg-comment.standalone
+COMMENTFILE=	${PKGDIR}/pkg-comment.standalone
 PKGMESSAGE=	mustnotexist
 PLIST=		${PKGDIR}/pkg-plist.standalone
 
diff --git a/lang/stackless_python/Makefile b/lang/stackless_python/Makefile
index 6d297882632f..abf71d997b88 100644
--- a/lang/stackless_python/Makefile
+++ b/lang/stackless_python/Makefile
@@ -24,7 +24,7 @@ ONLY_FOR_ARCHS=	i386 powerpc
 CVSDATE=	021026
 MASTERDIR=	${.CURDIR}/../../lang/python
 
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 DESCR=		${.CURDIR}/pkg-descr
 MD5_FILE=	${.CURDIR}/distinfo
 PLIST=		${WRKDIR}/pkg-plist
diff --git a/mail/qmail-ldap/Makefile b/mail/qmail-ldap/Makefile
index f23cecdc8998..ad884c9341da 100644
--- a/mail/qmail-ldap/Makefile
+++ b/mail/qmail-ldap/Makefile
@@ -113,7 +113,7 @@ certificate-req:
 MASTERDIR=	${QMAIL_PORT}
 PATCHDIR=	${.CURDIR}/files
 PKGDIR_LOCAL=	${.CURDIR}
-COMMENT=	${PKGDIR_LOCAL}/pkg-comment
+COMMENTFILE=	${PKGDIR_LOCAL}/pkg-comment
 DESCR=		${PKGDIR_LOCAL}/pkg-descr
 PKGMESSAGE=	${PKGDIR_LOCAL}/pkg-message
 PLIST=		${PKGDIR_LOCAL}/pkg-plist
diff --git a/mail/qmail-mysql/Makefile b/mail/qmail-mysql/Makefile
index 4559601af023..7e2af75fe1fe 100644
--- a/mail/qmail-mysql/Makefile
+++ b/mail/qmail-mysql/Makefile
@@ -46,7 +46,7 @@ qmail-mysql-post-patch:
 # Local overrides
 MASTERDIR=	${QMAIL_PORT}
 PKGDIR_LOCAL=	${.CURDIR}
-COMMENT=	${PKGDIR_LOCAL}/pkg-comment
+COMMENTFILE=	${PKGDIR_LOCAL}/pkg-comment
 DESCR=		${PKGDIR_LOCAL}/pkg-descr
 PKGMESSAGE=	${PKGDIR_LOCAL}/pkg-message
 
diff --git a/mail/qmail-smtp_auth+tls/Makefile b/mail/qmail-smtp_auth+tls/Makefile
index d6a60d5a93a0..42a75701d0f2 100644
--- a/mail/qmail-smtp_auth+tls/Makefile
+++ b/mail/qmail-smtp_auth+tls/Makefile
@@ -93,7 +93,7 @@ certificate-req:
 # Local overrides
 MASTERDIR=	${QMAIL_PORT}
 PKGDIR_LOCAL=	${.CURDIR}
-COMMENT=	${PKGDIR_LOCAL}/pkg-comment
+COMMENTFILE=	${PKGDIR_LOCAL}/pkg-comment
 DESCR=		${PKGDIR_LOCAL}/pkg-descr
 PKGMESSAGE=	${PKGDIR_LOCAL}/pkg-message
 PLIST=		${PKGDIR_LOCAL}/pkg-plist
diff --git a/mail/qmail-smtp_auth/Makefile b/mail/qmail-smtp_auth/Makefile
index d6a60d5a93a0..42a75701d0f2 100644
--- a/mail/qmail-smtp_auth/Makefile
+++ b/mail/qmail-smtp_auth/Makefile
@@ -93,7 +93,7 @@ certificate-req:
 # Local overrides
 MASTERDIR=	${QMAIL_PORT}
 PKGDIR_LOCAL=	${.CURDIR}
-COMMENT=	${PKGDIR_LOCAL}/pkg-comment
+COMMENTFILE=	${PKGDIR_LOCAL}/pkg-comment
 DESCR=		${PKGDIR_LOCAL}/pkg-descr
 PKGMESSAGE=	${PKGDIR_LOCAL}/pkg-message
 PLIST=		${PKGDIR_LOCAL}/pkg-plist
diff --git a/mail/qmail-tls/Makefile b/mail/qmail-tls/Makefile
index d6a60d5a93a0..42a75701d0f2 100644
--- a/mail/qmail-tls/Makefile
+++ b/mail/qmail-tls/Makefile
@@ -93,7 +93,7 @@ certificate-req:
 # Local overrides
 MASTERDIR=	${QMAIL_PORT}
 PKGDIR_LOCAL=	${.CURDIR}
-COMMENT=	${PKGDIR_LOCAL}/pkg-comment
+COMMENTFILE=	${PKGDIR_LOCAL}/pkg-comment
 DESCR=		${PKGDIR_LOCAL}/pkg-descr
 PKGMESSAGE=	${PKGDIR_LOCAL}/pkg-message
 PLIST=		${PKGDIR_LOCAL}/pkg-plist
diff --git a/misc/amanda-client/Makefile b/misc/amanda-client/Makefile
index 16388333d255..b92db49efb2f 100644
--- a/misc/amanda-client/Makefile
+++ b/misc/amanda-client/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
 PORTREVISION=	0
 
 MASTERDIR=	${.CURDIR}/../amanda-server
-COMMENT=	${PKGDIR}/pkg-comment.client
+COMMENTFILE=	${PKGDIR}/pkg-comment.client
 PKGINSTALL=	mustnotexist
 PLIST=		${PKGDIR}/pkg-plist.client
 
diff --git a/misc/amanda25-client/Makefile b/misc/amanda25-client/Makefile
index 16388333d255..b92db49efb2f 100644
--- a/misc/amanda25-client/Makefile
+++ b/misc/amanda25-client/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
 PORTREVISION=	0
 
 MASTERDIR=	${.CURDIR}/../amanda-server
-COMMENT=	${PKGDIR}/pkg-comment.client
+COMMENTFILE=	${PKGDIR}/pkg-comment.client
 PKGINSTALL=	mustnotexist
 PLIST=		${PKGDIR}/pkg-plist.client
 
diff --git a/misc/amanda26-client/Makefile b/misc/amanda26-client/Makefile
index 16388333d255..b92db49efb2f 100644
--- a/misc/amanda26-client/Makefile
+++ b/misc/amanda26-client/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
 PORTREVISION=	0
 
 MASTERDIR=	${.CURDIR}/../amanda-server
-COMMENT=	${PKGDIR}/pkg-comment.client
+COMMENTFILE=	${PKGDIR}/pkg-comment.client
 PKGINSTALL=	mustnotexist
 PLIST=		${PKGDIR}/pkg-plist.client
 
diff --git a/misc/amanda32-client/Makefile b/misc/amanda32-client/Makefile
index 16388333d255..b92db49efb2f 100644
--- a/misc/amanda32-client/Makefile
+++ b/misc/amanda32-client/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	${MASTERPORTNAME:S/-server/-client/g}
 PORTREVISION=	0
 
 MASTERDIR=	${.CURDIR}/../amanda-server
-COMMENT=	${PKGDIR}/pkg-comment.client
+COMMENTFILE=	${PKGDIR}/pkg-comment.client
 PKGINSTALL=	mustnotexist
 PLIST=		${PKGDIR}/pkg-plist.client
 
diff --git a/net/cvsup/Makefile b/net/cvsup/Makefile
index 0859dae2da00..67503fc31669 100644
--- a/net/cvsup/Makefile
+++ b/net/cvsup/Makefile
@@ -19,7 +19,7 @@ MAINTAINER=	jdp@FreeBSD.org
 M3FLAGS+=	-DNOGUI
 BUILD_DEPENDS=	${PREFIX}/lib/m3/pkg/tcp/${TARGET}/libm3tcp.a:${PORTSDIR}/lang/ezm3
 PKGNAMESUFFIX=	-without-gui
-COMMENT=	${PKGDIR}/pkg-comment.nogui
+COMMENTFILE=	${PKGDIR}/pkg-comment.nogui
 DESCR=		${PKGDIR}/pkg-descr.nogui
 .else
 USE_XLIB=	yes
diff --git a/print/acroread-commfont/Makefile b/print/acroread-commfont/Makefile
index e3f97f5969c6..5f1d8a453506 100644
--- a/print/acroread-commfont/Makefile
+++ b/print/acroread-commfont/Makefile
@@ -42,7 +42,7 @@ RUN_DEPENDS=	acroread4:${PORTSDIR}/print/acroread4
 .else
 ###### For slave ports ##############################
 ## Use a local directory of the slave port!!
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 FILESDIR=	${.CURDIR}/files
diff --git a/print/bjfiltercom/Makefile b/print/bjfiltercom/Makefile
index 4236413dec9b..47e9597b8d64 100644
--- a/print/bjfiltercom/Makefile
+++ b/print/bjfiltercom/Makefile
@@ -40,7 +40,7 @@ EXTRACT_AFTER_ARGS=	| cpio -id --quiet
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}${_SUF1}${_SUF2}
 DIST_SUBDIR=	bjfilter
 PLIST=		${.CURDIR}/pkg-plist
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 DESCR=		${.CURDIR}/pkg-descr
 MD5_FILE=	${.CURDIR}/distinfo
 ONLY_FOR_ARCHS=	i386
diff --git a/print/pips800/Makefile b/print/pips800/Makefile
index 980695d00dfe..ca4b32c8ebf9 100644
--- a/print/pips800/Makefile
+++ b/print/pips800/Makefile
@@ -72,7 +72,7 @@ FILTER=		${FILESDIR}/filter.rev
 BASE_NAME=	pips${PRTYPE}
 PAPERSIZE?=	a4
 # for slave ports
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 DESCR=		${.CURDIR}/pkg-descr
 .if ${PORTVERSION} == 2.0 && !defined(INTERNATIONAL_PRODUCTS)
 LANGS=		ja
diff --git a/print/yatex-mule/Makefile b/print/yatex-mule/Makefile
index fe934dfb9e5c..6349cdbcd4d1 100644
--- a/print/yatex-mule/Makefile
+++ b/print/yatex-mule/Makefile
@@ -8,7 +8,7 @@
 PKGNAMESUFFIX=	-mule
 
 MASTERDIR=	${.CURDIR}/../yatex
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 EMACS_PORT_NAME=mule
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/print/yatex-xemacs-mule/Makefile b/print/yatex-xemacs-mule/Makefile
index 5b518d945a69..ff825e5d5c08 100644
--- a/print/yatex-xemacs-mule/Makefile
+++ b/print/yatex-xemacs-mule/Makefile
@@ -8,7 +8,7 @@
 PKGNAMESUFFIX=	-xemacs-mule
 
 MASTERDIR=	${.CURDIR}/../yatex
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 EMACS_PORT_NAME=xemacs21-mule
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/print/yatex-xemacs/Makefile b/print/yatex-xemacs/Makefile
index 9275ed9d0de1..8db590e2260e 100644
--- a/print/yatex-xemacs/Makefile
+++ b/print/yatex-xemacs/Makefile
@@ -8,7 +8,7 @@
 PKGNAMESUFFIX=	-xemacs
 
 MASTERDIR=	${.CURDIR}/../yatex
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 EMACS_PORT_NAME=xemacs21
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/shells/zsh+euc_hack/Makefile b/shells/zsh+euc_hack/Makefile
index a6a6a5bf1890..df3ecb801b7f 100644
--- a/shells/zsh+euc_hack/Makefile
+++ b/shells/zsh+euc_hack/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	knu@FreeBSD.org
 
 EXTRA_PATCHES=	${.CURDIR}/files/patch-*
 
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 DESCR=		${.CURDIR}/pkg-descr
 
 .include "${MASTERDIR}/Makefile"
diff --git a/sysutils/mkisofs-devel/Makefile b/sysutils/mkisofs-devel/Makefile
index ed31f5e296f5..e59e7ae926ff 100644
--- a/sysutils/mkisofs-devel/Makefile
+++ b/sysutils/mkisofs-devel/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	0
 CATEGORIES=	sysutils
 
 MASTERDIR=	${.CURDIR}/../cdrtools
-COMMENT=	${PKGDIR}/pkg-comment.mkisofs
+COMMENTFILE=	${PKGDIR}/pkg-comment.mkisofs
 DESCR=		${PKGDIR}/pkg-descr.mkisofs
 PLIST=		${PKGDIR}/pkg-plist.mkisofs
 
diff --git a/sysutils/mkisofs/Makefile b/sysutils/mkisofs/Makefile
index ed31f5e296f5..e59e7ae926ff 100644
--- a/sysutils/mkisofs/Makefile
+++ b/sysutils/mkisofs/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	0
 CATEGORIES=	sysutils
 
 MASTERDIR=	${.CURDIR}/../cdrtools
-COMMENT=	${PKGDIR}/pkg-comment.mkisofs
+COMMENTFILE=	${PKGDIR}/pkg-comment.mkisofs
 DESCR=		${PKGDIR}/pkg-descr.mkisofs
 PLIST=		${PKGDIR}/pkg-plist.mkisofs
 
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 3af8dd6de428..90b30918d59f 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -34,7 +34,7 @@ INSTALLS_SHLIB=	yes
 WRKSRC=		${WRKDIR}/aspell-${PORTVERSION}	# needed for slave ports / options
 DOCSDIR=	${PREFIX}/share/doc/aspell
 DATADIR=	${PREFIX}/share/aspell
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 DESCR=		${.CURDIR}/pkg-descr
 
 CONF_DICT_ENV=	ASPELL="${PREFIX}/bin/aspell"	\
diff --git a/www/frontpage-zh/Makefile b/www/frontpage-zh/Makefile
index 9db504902df3..348488b90ec2 100644
--- a/www/frontpage-zh/Makefile
+++ b/www/frontpage-zh/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX=	zh-
 MAINTAINER=	hetzels@westbend.net
 
 MD5_FILE=	${.CURDIR}/distinfo
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
diff --git a/www/lynx-ssl/Makefile b/www/lynx-ssl/Makefile
index 04becda67a3c..a5d4a627ada8 100644
--- a/www/lynx-ssl/Makefile
+++ b/www/lynx-ssl/Makefile
@@ -8,7 +8,7 @@
 PKGNAMESUFFIX =	-ssl
 
 MASTERDIR=	${.CURDIR}/../lynx
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 DESCR=		${.CURDIR}/pkg-descr
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/netscape48-navigator/Makefile b/www/netscape48-navigator/Makefile
index efbd6a4217fc..bb7f7ac313d4 100644
--- a/www/netscape48-navigator/Makefile
+++ b/www/netscape48-navigator/Makefile
@@ -6,7 +6,7 @@
 #
 
 MASTERDIR=	${.CURDIR}/../netscape48-communicator
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 PLIST=		${.CURDIR}/pkg-plist
 
 BROWSER_NAME=	navigator
diff --git a/x11-toolkits/fltk-xunicode/Makefile b/x11-toolkits/fltk-xunicode/Makefile
index 89dd1ea9b613..0df06418625b 100644
--- a/x11-toolkits/fltk-xunicode/Makefile
+++ b/x11-toolkits/fltk-xunicode/Makefile
@@ -9,7 +9,7 @@ MASTERDIR=	${.CURDIR}/../fltk
 
 MAINTAINER=	knu@FreeBSD.org
 
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 
 WITH_XUNICODE=	yes
 
diff --git a/x11-toolkits/fox-xunicode/Makefile b/x11-toolkits/fox-xunicode/Makefile
index a8e95b8c3200..690d71e09b19 100644
--- a/x11-toolkits/fox-xunicode/Makefile
+++ b/x11-toolkits/fox-xunicode/Makefile
@@ -12,7 +12,7 @@ PORTREVISION=	1
 
 MAINTAINER=	ports@FreeBSD.org
 
-COMMENT=	${.CURDIR}/pkg-comment
+COMMENTFILE=	${.CURDIR}/pkg-comment
 
 WITH_XUNICODE=	yes