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

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

4 files changed, 103 insertions, 95 deletions

diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 5ce6be791a30..de352470c4c3 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -1,4 +1,4 @@
-# Created by: Martin Blapp
+# Created by: Martin Blapp <mb@imp.ch>
 # $FreeBSD$
 
 PORTNAME=	apache-openoffice
@@ -10,8 +10,8 @@ MASTER_SITES=	ftp://ftp.riken.jp/net/apache/incubator/ooo/3.4.1/source/ \
 DISTFILES+=	${OOOSRC} unowinreg.dll ${EXTSRC}:extsrc
 EXTRACT_ONLY=	${OOOSRC} ${EXTSRC}
 
-#de facto maintainer is maho@FreeBSD.org
-#Frequent Patch submitters should optionally sign Apache iCLA
+# De facto maintainer is maho@FreeBSD.org
+# Frequent patch submitters should optionally sign Apache iCLA
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Integrated wordprocessor/dbase/spreadsheet/drawing/chart/browser
 
@@ -19,6 +19,8 @@ LICENSE=	APACHE20
 
 PKGNAMESUFFIX=	3
 
+USES=		bison perl5 pkgconfig gmake
+USE_AUTOTOOLS=	autoconf
 USE_GNOME=	desktopfileutils gtk20 libxslt libidl glib20
 USE_XORG=	x11 ice xaw xau xext xrender xrandr \
 		xi xt xcursor xdamage xcomposite xfixes
@@ -28,7 +30,7 @@ USE_GSTREAMER=	yes
 USE_PYTHON=	yes
 USE_PERL5=	build
 USE_BZIP2=	yes
-USES+=		bison perl5 pkgconfig gmake
+GNU_CONFIGURE=	yes
 WITHOUT_CPU_CFLAGS=	true
 
 OPTIONS_DEFINE=	GCONF GNOMEVFS
@@ -104,22 +106,24 @@ OOOCXX=		${CCACHE_PREFIX} ${CXX}
 OOOCC=		${CC}
 OOOCXX=		${CXX}
 .endif
-CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}"		\
-		PATH=${WRKSRC}/solenv/bin:$$PATH	\
-		CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
-
-LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
-		expat.6:${PORTSDIR}/textproc/expat2 \
-		jpeg.11:${PORTSDIR}/graphics/jpeg \
-		curl:${PORTSDIR}/ftp/curl \
-		hunspell-1.3.0:${PORTSDIR}/textproc/hunspell \
+
+CONFIGURE_ENV+=	CC="${OOOCC}" CXX="${OOOCXX}" \
+		PATH=${WRKSRC}/solenv/bin:$$PATH \
+		CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
+		libexpat.so:${PORTSDIR}/textproc/expat2 \
+		libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libcurl.so:${PORTSDIR}/ftp/curl \
+		libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell \
 		libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib \
-		rdf.0:${PORTSDIR}/textproc/redland \
-		textcat.0:${PORTSDIR}/textproc/libtextcat \
-		freetype.9:${PORTSDIR}/print/freetype2 \
-		apr-1.4:${PORTSDIR}/devel/apr1 \
-		CoinMP.8:${PORTSDIR}/math/coinmp \
-		serf-1.0:${PORTSDIR}/www/serf
+		librdf.so:${PORTSDIR}/textproc/redland \
+		libtextcat.so:${PORTSDIR}/textproc/libtextcat \
+		libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libapr-1.so:${PORTSDIR}/devel/apr1 \
+		libCoinMP.so:${PORTSDIR}/math/coinmp \
+		libserf-1.so:${PORTSDIR}/www/serf
 
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
@@ -140,8 +144,6 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		dmake:${PORTSDIR}/devel/dmake \
 		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 
-USE_AUTOTOOLS=	autoconf
-GNU_CONFIGURE=	yes
 WRKSRC?=	${WRKDIR}/aoo-${PORTVERSION}/main
 BASH?=		${PREFIX}/bin/bash
 SUB_FILES=	pkg-message
@@ -151,54 +153,54 @@ SUB_LIST=	EXECBASE=${EXECBASE} OOOTAG=${OOOTAG} OOODIR=${OOODIR}
 MAKE_JOBS_NUMBER=	4
 .endif
 
-CONFIGURE_ARGS+=	--enable-verbose \
-			--enable-symbols=small \
-			--enable-crashdump \
-			--with-vendor="FreeBSD ports system"	\
-			--with-epm=${LOCALBASE}/bin/epm \
-			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
-			--with-gperf=${LOCALBASE}/bin/gperf	\
-			--x-includes=${LOCALBASE}/include	\
-			--x-libraries=${LOCALBASE}lib	\
-			--with-system-libxml 		\
-			--with-system-libxslt 		\
-			--with-system-cairo --enable-cairo \
-			--with-system-boost 		\
-			--with-system-zlib		\
-			--with-system-python		\
-			--with-system-expat		\
-			--with-system-openssl		\
-			--with-system-curl		\
-			--with-system-poppler \
-			--with-system-redland \
-			--with-system-libtextcat \
-			--with-system-libtextcat-data=${LOCALBASE}/share/libtextcat \
-			--with-system-vigra \
-			--with-system-stdlibs \
-			--with-system-apr \
-			--with-system-apr-util \
-			--with-system-coinmp \
-			--with-commons-codec-jar=${JAVALIBDIR}/commons-codec.jar \
-			--with-commons-lang-jar=${JAVALIBDIR}/commons-lang.jar	\
-			--with-commons-httpclient-jar=${JAVALIBDIR}/commons-httpclient.jar \
-			--with-commons-logging-jar=${JAVALIBDIR}/commons-logging.jar	\
-			--with-junit=${LOCALBASE}/share/java/classes/junit.jar \
-			--with-package-format="archive" \
-			--enable-gstreamer \
-			--enable-minimizer \
-			--enable-presenter-console \
-			--enable-wiki-publisher \
-			--enable-dbus \
-			--enable-opengl \
-			--enable-category-b \
-			--with-system-hunspell \
-			--with-system-saxon     \
-			--with-saxon-jar=${JAVALIBDIR}/saxon9.jar  \
-			--with-system-beanshell	\
-			--with-beanshell-jar=${JAVALIBDIR}/bsh.jar \
-			--without-fonts
-#			--with-system-jpeg
-#			--with-system-serf \
+CONFIGURE_ARGS+=--enable-verbose \
+		--enable-symbols=small \
+		--enable-crashdump \
+		--with-vendor="FreeBSD ports system" \
+		--with-epm=${LOCALBASE}/bin/epm \
+		--with-gnu-patch=${LOCALBASE}/bin/gpatch \
+		--with-gperf=${LOCALBASE}/bin/gperf \
+		--x-includes=${LOCALBASE}/include \
+		--x-libraries=${LOCALBASE}lib \
+		--with-system-libxml \
+		--with-system-libxslt \
+		--with-system-cairo --enable-cairo \
+		--with-system-boost \
+		--with-system-zlib \
+		--with-system-python \
+		--with-system-expat \
+		--with-system-openssl \
+		--with-system-curl \
+		--with-system-poppler \
+		--with-system-redland \
+		--with-system-libtextcat \
+		--with-system-libtextcat-data=${LOCALBASE}/share/libtextcat \
+		--with-system-vigra \
+		--with-system-stdlibs \
+		--with-system-apr \
+		--with-system-apr-util \
+		--with-system-coinmp \
+		--with-commons-codec-jar=${JAVALIBDIR}/commons-codec.jar \
+		--with-commons-lang-jar=${JAVALIBDIR}/commons-lang.jar \
+		--with-commons-httpclient-jar=${JAVALIBDIR}/commons-httpclient.jar \
+		--with-commons-logging-jar=${JAVALIBDIR}/commons-logging.jar \
+		--with-junit=${LOCALBASE}/share/java/classes/junit.jar \
+		--with-package-format="archive" \
+		--enable-gstreamer \
+		--enable-minimizer \
+		--enable-presenter-console \
+		--enable-wiki-publisher \
+		--enable-dbus \
+		--enable-opengl \
+		--enable-category-b \
+		--with-system-hunspell \
+		--with-system-saxon \
+		--with-saxon-jar=${JAVALIBDIR}/saxon9.jar \
+		--with-system-beanshell \
+		--with-beanshell-jar=${JAVALIBDIR}/bsh.jar \
+		--without-fonts
+#		--with-system-jpeg
+#		--with-system-serf \
 
 OOOEXTENSIONS+=		minimizer/presentation-minimizer.oxt
 OOOEXTENSIONS+=		presenter/presenter-screen.oxt
@@ -228,7 +230,8 @@ pre-everything::
 .endif
 
 post-extract:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll ${WRKSRC}/external/unowinreg/
+	@${CP} -p ${DISTDIR}/${DIST_SUBDIR}/unowinreg.dll \
+		${WRKSRC}/external/unowinreg/
 	@${MKDIR} ${WRKSRC}/../ext_sources
 	@${RM} -rf ${WRKSRC}/l10n
 
@@ -249,7 +252,7 @@ do-build:
 	@cd ${WRKDIR}/aoo-${PORTVERSION} ; ${PRINTF} "main=active\n" >> source_config
 	@cd ${WRKDIR}/aoo-${PORTVERSION} ; ${PRINTF} "extras=active\n" >> source_config
 	@cd ${WRKSRC} ; ./bootstrap
-	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util  ; build.pl --all -P${MAKE_JOBS_NUMBER} -- -P${MAKE_JOBS_NUMBER}"
+	@cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ; build.pl --all -P${MAKE_JOBS_NUMBER} -- -P${MAKE_JOBS_NUMBER}"
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice/archive/install/${LOCALIZED_LANG}/ ; ${LS} *.tar.?z > ${WRKDIR}/INSTALLFILES
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 .. ; \