From ef809618aba438ad5b5f0de7331ff613247c2296 Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Mon, 15 Mar 2004 13:18:30 +0000 Subject: [PATCH] Do not bork COMMENT/pkg-message/pkg-descr Submitted by: eik --- editors/openoffice-1.1-devel/Makefile | 11 +++++++++++ editors/openoffice-1.1/Makefile | 11 +++++++++++ editors/openoffice.org-1.1-devel/Makefile | 11 +++++++++++ editors/openoffice.org-1.1/Makefile | 11 +++++++++++ 4 files changed, 44 insertions(+) diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile index e7271a1b8912..d1ca47ed035e 100644 --- a/editors/openoffice-1.1-devel/Makefile +++ b/editors/openoffice-1.1-devel/Makefile @@ -51,6 +51,15 @@ DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/ LANG_EXT=01 .else # +# Add pkg-descr and pkg-message if available +# +.if exists(${.CURDIR}/pkg-descr) +DESCR= ${.CURDIR}/pkg-descr +.endif +.if exists(${.CURDIR}/pkg-message) +PKGMESSAGE= ${.CURDIR}/pkg-message +.endif +# # Set prefix and suffix # .if defined(LANG_PKGNAME) @@ -85,7 +94,9 @@ CC= gcc32 CXX= g++32 MAINTAINER= openoffice@FreeBSD.org +.if !defined(COMMENT) COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser +.endif # # The JDK dependency needs to be at the first place, so all diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile index e7271a1b8912..d1ca47ed035e 100644 --- a/editors/openoffice-1.1/Makefile +++ b/editors/openoffice-1.1/Makefile @@ -51,6 +51,15 @@ DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/ LANG_EXT=01 .else # +# Add pkg-descr and pkg-message if available +# +.if exists(${.CURDIR}/pkg-descr) +DESCR= ${.CURDIR}/pkg-descr +.endif +.if exists(${.CURDIR}/pkg-message) +PKGMESSAGE= ${.CURDIR}/pkg-message +.endif +# # Set prefix and suffix # .if defined(LANG_PKGNAME) @@ -85,7 +94,9 @@ CC= gcc32 CXX= g++32 MAINTAINER= openoffice@FreeBSD.org +.if !defined(COMMENT) COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser +.endif # # The JDK dependency needs to be at the first place, so all diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile index e7271a1b8912..d1ca47ed035e 100644 --- a/editors/openoffice.org-1.1-devel/Makefile +++ b/editors/openoffice.org-1.1-devel/Makefile @@ -51,6 +51,15 @@ DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/ LANG_EXT=01 .else # +# Add pkg-descr and pkg-message if available +# +.if exists(${.CURDIR}/pkg-descr) +DESCR= ${.CURDIR}/pkg-descr +.endif +.if exists(${.CURDIR}/pkg-message) +PKGMESSAGE= ${.CURDIR}/pkg-message +.endif +# # Set prefix and suffix # .if defined(LANG_PKGNAME) @@ -85,7 +94,9 @@ CC= gcc32 CXX= g++32 MAINTAINER= openoffice@FreeBSD.org +.if !defined(COMMENT) COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser +.endif # # The JDK dependency needs to be at the first place, so all diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile index e7271a1b8912..d1ca47ed035e 100644 --- a/editors/openoffice.org-1.1/Makefile +++ b/editors/openoffice.org-1.1/Makefile @@ -51,6 +51,15 @@ DICT_DIR= ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/ LANG_EXT=01 .else # +# Add pkg-descr and pkg-message if available +# +.if exists(${.CURDIR}/pkg-descr) +DESCR= ${.CURDIR}/pkg-descr +.endif +.if exists(${.CURDIR}/pkg-message) +PKGMESSAGE= ${.CURDIR}/pkg-message +.endif +# # Set prefix and suffix # .if defined(LANG_PKGNAME) @@ -85,7 +94,9 @@ CC= gcc32 CXX= g++32 MAINTAINER= openoffice@FreeBSD.org +.if !defined(COMMENT) COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser +.endif # # The JDK dependency needs to be at the first place, so all