de-pkg-comment

8 files changed, 27 insertions, 23 deletions

diff --git a/editors/ooodict-all/Makefile b/editors/ooodict-all/Makefile
index 74b6db375206..4cad8657d6dd 100644
--- a/editors/ooodict-all/Makefile
+++ b/editors/ooodict-all/Makefile
@@ -12,6 +12,9 @@ MASTER_SITES+=	http://dict.progbits.com/
 DISTFILES+=	${LANGDIST}
 
 MAINTAINER=     openoffice@FreeBSD.org
+.if !definded(COMMENT)
+COMMENT=	MySpell dictionaries for OpenOffice.org
+.endif
 
 EXTRACT_ONLY=
 
@@ -48,10 +51,6 @@ PKGNAMEPREFIX=	${LANGPREFIX}-
 PKGNAMESUFFIX=	-${LANGSUFFIX}
 .endif
 
-.if exists(${.CURDIR}/pkg-comment)
-COMMENTFILE=	${.CURDIR}/pkg-comment
-.endif
-
 .if exists(${.CURDIR}/pkg-descr)
 DESCR=		${.CURDIR}/pkg-descr
 .endif
diff --git a/editors/ooodict-all/pkg-comment b/editors/ooodict-all/pkg-comment
deleted file mode 100644
index 78983902cd31..000000000000
--- a/editors/ooodict-all/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-MySpell dictionaries for OpenOffice.org
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile
index bb26f84032c5..1c1d67133270 100644
--- a/editors/openoffice-1.0/Makefile
+++ b/editors/openoffice-1.0/Makefile
@@ -49,15 +49,12 @@ DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 LANG_EXT=01
 .else
 #
-# Add pkg-comment and pkg-descr if available
+# Add pkg-descr and pkg-message if available
 #
-.if exists(${.CURDIR}/pkg-comment)
-COMMENTFILE=	${.CURDIR}/pkg-comment
-.endif
 .if exists(${.CURDIR}/pkg-descr)
 DESCR=	${.CURDIR}/pkg-descr
 .endif
-.if exists(${.CURDIR}/pkg-descr)
+.if exists(${.CURDIR}/pkg-message)
 PKGMESSAGE=	${.CURDIR}/pkg-message
 .endif
 #
@@ -109,6 +106,9 @@ CXX=		g++32
 EXTRACT_ONLY=	OOo_${PORTVERSION}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
+.if !defined(COMMENT)
+COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
+.endif
 #.if !defined(USE_GCC)
 #BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
 #.endif
@@ -406,7 +406,10 @@ extract-mozilla:
 	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
+	
+if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment)
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
+.endif
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla
 .endif
diff --git a/editors/openoffice-1.0/pkg-comment b/editors/openoffice-1.0/pkg-comment
deleted file mode 100644
index 7c6d1b73d17a..000000000000
--- a/editors/openoffice-1.0/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
index bb26f84032c5..1c1d67133270 100644
--- a/editors/openoffice.org-1.0/Makefile
+++ b/editors/openoffice.org-1.0/Makefile
@@ -49,15 +49,12 @@ DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 LANG_EXT=01
 .else
 #
-# Add pkg-comment and pkg-descr if available
+# Add pkg-descr and pkg-message if available
 #
-.if exists(${.CURDIR}/pkg-comment)
-COMMENTFILE=	${.CURDIR}/pkg-comment
-.endif
 .if exists(${.CURDIR}/pkg-descr)
 DESCR=	${.CURDIR}/pkg-descr
 .endif
-.if exists(${.CURDIR}/pkg-descr)
+.if exists(${.CURDIR}/pkg-message)
 PKGMESSAGE=	${.CURDIR}/pkg-message
 .endif
 #
@@ -109,6 +106,9 @@ CXX=		g++32
 EXTRACT_ONLY=	OOo_${PORTVERSION}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
+.if !defined(COMMENT)
+COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
+.endif
 #.if !defined(USE_GCC)
 #BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
 #.endif
@@ -406,7 +406,10 @@ extract-mozilla:
 	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
+	
+if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment)
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
+.endif
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla
 .endif
diff --git a/editors/openoffice.org-1.0/pkg-comment b/editors/openoffice.org-1.0/pkg-comment
deleted file mode 100644
index 7c6d1b73d17a..000000000000
--- a/editors/openoffice.org-1.0/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile
index bb26f84032c5..1c1d67133270 100644
--- a/editors/openoffice/Makefile
+++ b/editors/openoffice/Makefile
@@ -49,15 +49,12 @@ DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 LANG_EXT=01
 .else
 #
-# Add pkg-comment and pkg-descr if available
+# Add pkg-descr and pkg-message if available
 #
-.if exists(${.CURDIR}/pkg-comment)
-COMMENTFILE=	${.CURDIR}/pkg-comment
-.endif
 .if exists(${.CURDIR}/pkg-descr)
 DESCR=	${.CURDIR}/pkg-descr
 .endif
-.if exists(${.CURDIR}/pkg-descr)
+.if exists(${.CURDIR}/pkg-message)
 PKGMESSAGE=	${.CURDIR}/pkg-message
 .endif
 #
@@ -109,6 +106,9 @@ CXX=		g++32
 EXTRACT_ONLY=	OOo_${PORTVERSION}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
+.if !defined(COMMENT)
+COMMENT=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
+.endif
 #.if !defined(USE_GCC)
 #BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
 #.endif
@@ -406,7 +406,10 @@ extract-mozilla:
 	@${CP} -r ${PORTSDIR}/www/mozilla-vendor/files ${WRKDIR}/mozilla
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/Makefile ${WRKDIR}/mozilla
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/distinfo ${WRKDIR}/mozilla
+	
+if exists(${PORTSDIR}/www/mozilla-vendor/pkg-comment)
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-comment ${WRKDIR}/mozilla
+.endif
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-descr ${WRKDIR}/mozilla
 	@${CP} ${PORTSDIR}/www/mozilla-vendor/pkg-message ${WRKDIR}/mozilla
 .endif
diff --git a/editors/openoffice/pkg-comment b/editors/openoffice/pkg-comment
deleted file mode 100644
index 7c6d1b73d17a..000000000000
--- a/editors/openoffice/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser