Fix some annoying formatting and style bugs so I can do more work on this

port, and modernize LIB_DEPENDS.  Otherwise, no functional changes.

3 files changed, 29 insertions, 24 deletions

diff --git a/editors/openoffice-3/files/Makefile.knobs b/editors/openoffice-3/files/Makefile.knobs
index d5c399470ad3..be63c1e0bba6 100644
--- a/editors/openoffice-3/files/Makefile.knobs
+++ b/editors/openoffice-3/files/Makefile.knobs
@@ -1,7 +1,7 @@
-# Makefile for knobs
-# Whom:         Maho Nakata <maho@FreeBSD.org>
+# Created by: Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
-# Makefile for knobs
+#
+# Makefile for knobs (?)
 
 CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" --with-ant-home="${LOCALBASE}/share/java/apache-ant"
 CONFIGURE_ARGS+=	--with-lang=${LOCALIZED_LANG}
@@ -10,7 +10,7 @@ pre-fetch:
 	@${ECHO} "OPTIONS:"
 	@${ECHO}
 	@${ECHO} "You can select the language for OOo by making it with:"
-	@${ECHO} "make LOCALIZED_LANG=xx" 
+	@${ECHO} "make LOCALIZED_LANG=xx"
 	@${ECHO} "while xx can be one of the following"
 	@${ECHO} "af ar as-IN be-BY bg br bn bn-BD bn-IN bs ca cs cy da"
 	@${ECHO} "de dz el en-GB en-US en-ZA eo es et eu fa fi fr ga gl"
@@ -23,6 +23,8 @@ pre-fetch:
 	@${ECHO}
 	@${ECHO} "NOTICE:"
 	@${ECHO}
-	@${ECHO} "To build OOo, you should have a lot"
-	@${ECHO} "of free diskspace (~ 11GB) and memory (~ 2GB)."
-	@${ECHO} "If you want SDK and/or solver, please type make sdk and/or make solver"
+	@${ECHO} "To build OOo, you should have a lot of free diskspace"
+	@${ECHO} "(~ 11GB) and memory (~ 2GB)."
+	@${ECHO} 'If you want SDK and/or solver, please type "make sdk"
+	@${ECHO} 'and/or "make solver", respectively.'
+	@${ECHO}
diff --git a/editors/openoffice-3/files/Makefile.localized b/editors/openoffice-3/files/Makefile.localized
index 1b6364941f2f..0ea12e428efb 100644
--- a/editors/openoffice-3/files/Makefile.localized
+++ b/editors/openoffice-3/files/Makefile.localized
@@ -1,9 +1,10 @@
-# localized makefile
-# Whom:         Maho Nakata <maho@FreeBSD.org>
+# Created by: Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
+#
+# Localized makefile
 
 ################################################################
-#See solenv/inc/postset.mk for details	
+# See solenv/inc/postset.mk for details
 ################################################################
 .if defined(LOCALIZED_LANG)
 .if ${LOCALIZED_LANG} == "af"
@@ -152,7 +153,7 @@ LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "hu"
-CATEGORIES+=     hungarian
+CATEGORIES+=	hungarian
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
@@ -179,7 +180,7 @@ LANG_PKGNAME=	kn
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "ko"
-CATEGORIES+=     korean
+CATEGORIES+=	korean
 LANG_PKGNAME=	${LOCALIZED_LANG}
 .endif
 ################################################################
@@ -268,7 +269,7 @@ LANG_CONFIGURE_ARG=	PORT
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "pt-BR"
-COMMENT=        Editor texto/grBaGico, banco de dados/planilha/navegador integrado
+COMMENT=	Editor texto/grBaGico, banco de dados/planilha/navegador integrado
 CATEGORIES+=	portuguese
 LANG_PKGNAME=	pt
 LANG_SUFFIX=	BR
diff --git a/editors/openoffice-3/files/Makefile.others b/editors/openoffice-3/files/Makefile.others
index 14d039ca28b4..2be564726b4c 100644
--- a/editors/openoffice-3/files/Makefile.others
+++ b/editors/openoffice-3/files/Makefile.others
@@ -1,13 +1,14 @@
-# Makefile for other stuffs
-# Whom:         Maho Nakata <maho@FreeBSD.org>
+# Created by: Maho Nakata <maho@FreeBSD.org>
 # $FreeBSD$
+#
+# Makefile for other stuff
 
-#other stuffs which are not directly related to making ports
-#package-rename: rename package for uploading
-#package-canonical: making official packages (WIP)
-#ure:  URE (Uno Runtime Environment) packages (WIP)
-#solver: solver
-#languagepack: language pack
+# Other stuff which is not directly related to making ports
+# package-rename: rename package for uploading
+# package-canonical: making official packages (WIP)
+# ure: URE (Uno Runtime Environment) packages (WIP)
+# solver: solver
+# languagepack: language pack
 
 package-rename:
 	@${ECHO_MSG} "===>   Rename package for Apache OpenOffice mirror upload";
@@ -58,9 +59,10 @@ languagepack:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/archive/install/${LOCALIZED_LANG} ; ls Apache_OpenOffice*tar.* > ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK
 	@cd ${WRKDIR}/langpack_tmp ; \
 	for i in `${CAT} ${WRKDIR}/${LOCALIZED_LANG}_LANGPACK`; do \
-                ${ECHO_CMD} "extracting $$i" ; \
-                cd ${WRKDIR}/langpack_tmp ; ${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/archive/install/${LOCALIZED_LANG}/$$i ; \
-        done
+		${ECHO_CMD} "extracting $$i" ; \
+		cd ${WRKDIR}/langpack_tmp ; \
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_languagepack/archive/install/${LOCALIZED_LANG}/$$i ; \
+	done
 	@cd ${WRKDIR}/langpack_tmp/Apache_OpenOffice*/ ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR} ; \
 		${MV} * ../${INSTALLATION_BASEDIR} ; cd .. ; \