change the name.

4 files changed, 11 insertions, 13 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index b169b95f1bab..6c65ecbd81ad 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: OpenOffice.org
+# New ports collection makefile for: Apache OpenOffice
 # Date created:		28 February 2002
 # Whom:                 Martin Blapp
 #
@@ -102,8 +102,7 @@ LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
 		poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \
 		rdf.0:${PORTSDIR}/textproc/redland \
 		textcat.0:${PORTSDIR}/textproc/libtextcat \
-		freetype.9:${PORTSDIR}/print/freetype2 \
-		graphite.3:${PORTSDIR}/graphics/silgraphite
+		freetype.9:${PORTSDIR}/print/freetype2
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
@@ -179,7 +178,6 @@ CONFIGURE_ARGS+=	--enable-verbose \
 			--with-system-beanshell	\
 			--with-beanshell-jar=${JAVALIBDIR}/bsh.jar
 
-#			--with-system-graphite
 OOOEXTENSIONS+=		minimizer/presentation-minimizer.oxt
 OOOEXTENSIONS+=		presenter/presenter-screen.oxt
 #OOOEXTENSIONS+=		pdfimport/pdfimport.oxt
diff --git a/editors/openoffice-3-devel/files/Makefile.others b/editors/openoffice-3-devel/files/Makefile.others
index d361328d8997..3eb9001c3118 100644
--- a/editors/openoffice-3-devel/files/Makefile.others
+++ b/editors/openoffice-3-devel/files/Makefile.others
@@ -10,17 +10,17 @@
 #languagepack: language pack
 
 package-rename:
-	@${ECHO_MSG} "===>   Rename package for OpenOffice.org mirror upload";
+	@${ECHO_MSG} "===>   Rename package for Apache OpenOffice mirror upload";
 	@${LN} ${PKGFILE} \
 		${WRKDIR}/../OOo-Dev_${PACKAGE_BASENAME}_install_${LOCALIZED_LANG}${PKG_SUFX}
 
 package-canonical:
-	@${ECHO_MSG} "===>   Canonical packaging for OpenOffice.org";
+	@${ECHO_MSG} "===>   Canonical packaging for Apache OpenOffice";
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/bsd/install/${LOCALIZED_LANG}/freebsd/ ;\
 	${TAR} cfj ${WRKDIR}/../OOo-Dev_${PACKAGE_BASENAME}_native_install_${LOCALIZED_LANG}${PKG_SUFX} .
 
 sdk:
-	@${ECHO_MSG} "===>   Make SDK of OpenOffice.org"
+	@${ECHO_MSG} "===>   Make SDK of Apache OpenOffice"
 	@${RM} -fr ${WRKDIR}/sdk_tmp
 	@${MKDIR} ${WRKDIR}/sdk_tmp
 	@cd ${WRKDIR}/sdk_tmp ; \
@@ -31,7 +31,7 @@ sdk:
 		${TAR} cfj ${WRKDIR}/../OOo-Dev-SDK_${PACKAGE_BASENAME}_install_en-US.tbz ${INSTALLATION_BASEDIR}_sdk
 
 ure:
-	@${ECHO_MSG} "===>   Make Uno Runtime Environment of OpenOffice.org"
+	@${ECHO_MSG} "===>   Make Uno Runtime Environment of Apache OpenOffice"
 	@${RM} -fr ${WRKDIR}/ure_tmp
 	@${MKDIR} ${WRKDIR}/ure_tmp
 	@cd ${WRKDIR}/ure_tmp ; \
@@ -42,11 +42,11 @@ ure:
 		${TAR} cfj ${WRKDIR}/../OOo-Dev-URE_${PACKAGE_BASENAME}_install_en-US.tbz ${INSTALLATION_BASEDIR}
 
 solver:
-	@${ECHO_MSG} "===>   Make Solver of OpenOffice.org"
+	@${ECHO_MSG} "===>   Make Solver of Apache OpenOffice"
 	@cd ${WRKSRC} ; ${TAR} cfj ${WRKDIR}/../${PACKAGE_BASENAME}_solver.tar.bz2 solver
 
 languagepack:
-	@${ECHO_MSG} "===>   Make languagepack of OpenOffice.org"
+	@${ECHO_MSG} "===>   Make languagepack of Apache OpenOffice"
 .if defined (ALL_LOCALIZED_LANGS)
 	@cd ${WRKSRC} ; ${BASH} -c 'source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; dmake ooolanguagepack'
 .else
diff --git a/editors/openoffice-3-devel/files/generate.pl b/editors/openoffice-3-devel/files/generate.pl
index 0bbb64ec9090..4dfa92bad119 100644
--- a/editors/openoffice-3-devel/files/generate.pl
+++ b/editors/openoffice-3-devel/files/generate.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# generate full build shell script for OpenOffice.org
+# generate full build shell script for Apache OpenOffice
 # Whom:         Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
 
diff --git a/editors/openoffice-3-devel/files/pkg-message.in b/editors/openoffice-3-devel/files/pkg-message.in
index 7bfa92c74667..5d4f68bb1a37 100644
--- a/editors/openoffice-3-devel/files/pkg-message.in
+++ b/editors/openoffice-3-devel/files/pkg-message.in
@@ -1,9 +1,9 @@
-OpenOffice.org Build %%OOOTAG%% Personal Install How-To
+Apache OpenOffice Build %%OOOTAG%% Personal Install How-To
 
 Written by:	Martin Blapp <mbr@freebsd.org>
 		and Maho Nakata <maho@FreeBSD.org>
 
-OpenOffice.org %%OOOTAG%% will soon been installed in
+Apache OpenOffice %%OOOTAG%% will soon been installed in
 %%PREFIX%%/%%EXECBASE%%
 
 1. User installation