Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 20 Apr 2004 16:13:41 -0700 (PDT)
From:      FreeBSD-gnats-submit@FreeBSD.org
To:        <openoffice@FreeBSD.org>
Subject:   ports/65409: big whitespace cleanup
Message-ID:  <200404202313.i3KNDfGA064071@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
Please review the patch below.  If you find any problem with it,
please send a follow-up to PR 65409 by replying to this message.

See <URL:http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/65409>.
-- 
Trevor Johnson <trevor@FreeBSD.org>


Index: ports/chinese/openoffice-1.0-zh_CN/Makefile
===================================================================
RCS file: /home/ncvs/ports/chinese/openoffice-1.0-zh_CN/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- ports/chinese/openoffice-1.0-zh_CN/Makefile	29 Jan 2004 11:49:50 -0000	1.6
+++ ports/chinese/openoffice-1.0-zh_CN/Makefile	8 Apr 2004 12:54:56 -0000
@@ -5,14 +5,14 @@
 # $FreeBSD: ports/chinese/openoffice-1.0-zh_CN/Makefile,v 1.6 2004/01/29 11:49:50 kris Exp $
 #
 
-CATEGORIES=     chinese
+CATEGORIES=	chinese
 
 NO_LATEST_LINK=	yes
-LANG_PKGNAME=   zh
+LANG_PKGNAME=	zh
 LANG_SUFFIX=	CN
-LANG_EXT=       86
-LANG_CONFIGURE_ARG=     CHINSIM
+LANG_EXT=	86
+LANG_CONFIGURE_ARG=	CHINSIM
 BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
-MASTERDIR=      ${.CURDIR}/../../editors/openoffice-1.0
+MASTERDIR=	${.CURDIR}/../../editors/openoffice-1.0
 
 .include "${MASTERDIR}/Makefile"
Index: ports/chinese/openoffice-1.1-zh_CN/Makefile
===================================================================
RCS file: /home/ncvs/ports/chinese/openoffice-1.1-zh_CN/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- ports/chinese/openoffice-1.1-zh_CN/Makefile	9 Nov 2003 14:11:21 -0000	1.2
+++ ports/chinese/openoffice-1.1-zh_CN/Makefile	8 Apr 2004 16:40:44 -0000
@@ -5,14 +5,14 @@
 # $FreeBSD: ports/chinese/openoffice-1.1-zh_CN/Makefile,v 1.2 2003/11/09 14:11:21 maho Exp $
 #
 
-CATEGORIES=     chinese
+CATEGORIES=	chinese
 
-LANG_PKGNAME=   zh
+LANG_PKGNAME=	zh
 LANG_SUFFIX=	CN
-LANG_EXT=       86
-LANG_CONFIGURE_ARG=     CHINSIM
+LANG_EXT=	86
+LANG_CONFIGURE_ARG=	CHINSIM
 BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
-MASTERDIR=      ${.CURDIR}/../../editors/openoffice-1.1
-L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+MASTERDIR=	${.CURDIR}/../../editors/openoffice-1.1
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
 
 .include "${MASTERDIR}/Makefile"
Index: ports/chinese/openoffice-1.1-zh_TW/Makefile
===================================================================
RCS file: /home/ncvs/ports/chinese/openoffice-1.1-zh_TW/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- ports/chinese/openoffice-1.1-zh_TW/Makefile	9 Nov 2003 14:11:21 -0000	1.2
+++ ports/chinese/openoffice-1.1-zh_TW/Makefile	8 Apr 2004 16:40:47 -0000
@@ -13,6 +13,6 @@
 LANG_CONFIGURE_ARG=	CHINTRAD
 BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
 MASTERDIR=	${.CURDIR}/../../editors/openoffice-1.1
-L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
 
 .include "${MASTERDIR}/Makefile"
Index: ports/editors/ooodict-all/Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/ooodict-all/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- ports/editors/ooodict-all/Makefile	4 Feb 2004 05:20:02 -0000	1.25
+++ ports/editors/ooodict-all/Makefile	8 Apr 2004 14:37:16 -0000
@@ -13,7 +13,7 @@
 DISTFILES+=	${LANGDIST}
 DISTFILES+=	${HYPHDIST}
 
-MAINTAINER=     openoffice@FreeBSD.org
+MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	MySpell dictionaries for OpenOffice.org
 
 EXTRACT_ONLY=
Index: ports/editors/ooodict-cs_CZ/Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/ooodict-cs_CZ/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- ports/editors/ooodict-cs_CZ/Makefile	15 Nov 2003 10:08:57 -0000	1.7
+++ ports/editors/ooodict-cs_CZ/Makefile	8 Apr 2004 14:37:46 -0000
@@ -9,7 +9,7 @@
 
 COMMENT=	Czech (Czech Republic) MySpell dictionary for OpenOffice.org
 
-LANGPREFIX=	cs 
+LANGPREFIX=	cs
 LANGSUFFIX=	CZ
 LANGDIST+=	cs_CZ.zip
 HYPHDIST+=	hyph_cs_CZ.zip
Index: ports/editors/openoffice-1.0/Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/openoffice-1.0/Makefile,v
retrieving revision 1.188
diff -u -r1.188 Makefile
--- ports/editors/openoffice-1.0/Makefile	12 Mar 2004 02:48:22 -0000	1.188
+++ ports/editors/openoffice-1.0/Makefile	8 Apr 2004 14:39:31 -0000
@@ -34,7 +34,7 @@
 UNZIP?=	${PREFIX}/bin/unzip
 ANT?=	${LOCALBASE}/bin/ant
 TCSH?=	/bin/tcsh
-PASTE?= /usr/bin/paste
+PASTE?=	/usr/bin/paste
 
 USE_GNOME=	orbit gtk12
 
@@ -43,7 +43,7 @@
 INSTALLATION_BASEDIR=	OpenOffice.org1.0
 BUILD_NR=		641
 DIST_SUBDIR=		openoffice1.0
-DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
+DICT_DIR=		${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
 #
 # configuration for language specific slave ports
@@ -91,7 +91,7 @@
 #
 # OO build is broken with the system gcc on STABLE.
 #
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
+BUILD_DEPENDS+=	gcc32:${PORTSDIR}/lang/gcc32
 CC=		gcc32
 CXX=		g++32
 USE_GCC=3.2
@@ -106,20 +106,20 @@
 # following dependencies use the same JDK.
 #
 .if !defined(WITH_BSD_JDK)
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk13
+BUILD_DEPENDS+=	${JAVAVM}:${PORTSDIR}/java/linux-sun-jdk13
 .else
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk13
+BUILD_DEPENDS+=	${JAVAVM}:${PORTSDIR}/java/jdk13
 .endif
 
 #.if !defined(USE_GCC)
 #BUILD_DEPENDS=	${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport
 #.endif
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
-BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
+BUILD_DEPENDS+=	${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
 .if !defined(DISPLAY)
-BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
+BUILD_DEPENDS+=	Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -132,20 +132,20 @@
 USE_BISON=	yes
 USE_GMAKE=	yes
 
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
+EXTRACT_BEFORE_ARGS_R=	-dc
+EXTRACT_AFTER_ARGS_R=	| ${TAR} -xf -
+EXTRACT_CMD_R=	${GZIP_CMD}
 EXTRACT_REST=	gpc231.tar.Z
 
 .if !defined(WITH_BSD_JDK)
-JDK13DIR?=      ${LOCALBASE}/linux-sun-jdk1.3.1
+JDK13DIR?=	${LOCALBASE}/linux-sun-jdk1.3.1
 .else
-JDK13DIR?=      ${LOCALBASE}/jdk1.3.1
+JDK13DIR?=	${LOCALBASE}/jdk1.3.1
 .endif
-JAVAVM=         ${JDK13DIR}/bin/java
+JAVAVM=		${JDK13DIR}/bin/java
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER= 253
+USE_AUTOCONF_VER=	253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${PORTVERSION}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
@@ -480,7 +480,7 @@
 	@${CP} ${WRKDIR}/mozilla/work/mozilla/dist/bin/regxpcom ${WRKDIR}/mozilla-runtime/
 	@-${RM} ${WRKDIR}/mozilla-runtime/components/component.reg
 	@cd ${WRKDIR}/mozilla-runtime && export MOZILLA_FIVE_HOME=. \
-		&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom 
+		&& export LD_LIBRARY_PATH=.:./lib && ./regxpcom
 	@${CP} ${WRKDIR}/mozilla-runtime/components/xpti.dat \
 		${WRKDIR}/mozilla-runtime/components/xptitemp.dat
 	@${RM} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKDIR}/mozilla-runtime/regxpcom
@@ -515,7 +515,7 @@
 .endif
 	@cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap
 .if defined(L10NHELP)
-	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck 
+	@${MKDIR} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
 	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/pck
 .endif
 .if !defined(DISPLAY)
Index: ports/editors/openoffice-1.1/Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/openoffice-1.1/Makefile,v
retrieving revision 1.140
diff -u -r1.140 Makefile
--- ports/editors/openoffice-1.1/Makefile	31 Mar 2004 13:54:59 -0000	1.140
+++ ports/editors/openoffice-1.1/Makefile	8 Apr 2004 14:46:30 -0000
@@ -43,7 +43,7 @@
 FRELEASE_NR=		1.1.1
 INSTALLATION_BASEDIR=	OpenOffice.org${FRELEASE_NR}
 DIST_SUBDIR=		openoffice1.1
-DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
+DICT_DIR=		${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 SIMPLEOSVER!=		${UNAME} -r | sed -e 's/\.//' | sed -e 's/\..*//'
 
 #
@@ -53,14 +53,14 @@
 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 	 
+# 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
 #
@@ -90,7 +90,7 @@
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
 # OOo requires gcc 3.2 (currently 3.3 is not supported)
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
+BUILD_DEPENDS+=	gcc32:${PORTSDIR}/lang/gcc32
 USE_GCC=3.2
 # XXX dirty
 CC=	gcc32
@@ -105,7 +105,7 @@
 # The JDK dependency needs to be at the first place, so all
 # following dependencies use the same JDK.
 #
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 \
+BUILD_DEPENDS+=	${JAVAVM}:${PORTSDIR}/java/jdk14 \
 		zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
@@ -114,7 +114,7 @@
 		${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries \
 		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
 .if !defined(DISPLAY)
-BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
+BUILD_DEPENDS+=	Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -127,16 +127,16 @@
 USE_BISON=	yes
 USE_GMAKE=	yes
 
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
+EXTRACT_BEFORE_ARGS_R=	-dc
+EXTRACT_AFTER_ARGS_R=	| ${TAR} -xf -
+EXTRACT_CMD_R=	${GZIP_CMD}
 EXTRACT_REST=	gpc231.tar.Z
 
 JDKDIR?=	${LOCALBASE}/jdk1.4.2
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER= 253
+USE_AUTOCONF_VER=	253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${FRELEASE_NR}_src/config_office
 .if defined(WITH_DEBUG)
@@ -557,7 +557,7 @@
 	@cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \
 		${TCSH} -c 'source FreeBSDEnv.Set && unsetenv TOP && cd sdk_oo && build.pl && deliver.pl'
 .endif
-	${MV} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/OpenOffice.org${FRELEASE_NR}_SDK.tar.gz ${WRKDIR}/../OOo_${FRELEASE_NR}_${OPSYS}${SIMPLEOSVER}Intel_sdk.tar.gz 
+	${MV} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/OpenOffice.org${FRELEASE_NR}_SDK.tar.gz ${WRKDIR}/../OOo_${FRELEASE_NR}_${OPSYS}${SIMPLEOSVER}Intel_sdk.tar.gz
 
 update:
 	@${MAKE} fetch
Index: ports/editors/openoffice-1.1-devel/Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/openoffice-1.1-devel/Makefile,v
retrieving revision 1.136
diff -u -r1.136 Makefile
--- ports/editors/openoffice-1.1-devel/Makefile	19 Mar 2004 04:31:38 -0000	1.136
+++ ports/editors/openoffice-1.1-devel/Makefile	8 Apr 2004 14:44:05 -0000
@@ -43,7 +43,7 @@
 FRELEASE_NR=		1.1.1
 INSTALLATION_BASEDIR=	OpenOffice.org${FRELEASE_NR}
 DIST_SUBDIR=		openoffice1.1
-DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
+DICT_DIR=		${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
 #
 # configuration for language specific slave ports
@@ -52,14 +52,14 @@
 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 	 
+# 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
 #
@@ -89,7 +89,7 @@
 LANG_SORTED=`${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -`
 
 # OOo requires gcc 3.2 (currently 3.3 is not supported)
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
+BUILD_DEPENDS+=	gcc32:${PORTSDIR}/lang/gcc32
 USE_GCC=3.2
 CC=	gcc32
 CXX=	g++32
@@ -103,7 +103,7 @@
 # The JDK dependency needs to be at the first place, so all
 # following dependencies use the same JDK.
 #
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14 \
+BUILD_DEPENDS+=	${JAVAVM}:${PORTSDIR}/java/jdk14 \
 		zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
@@ -112,7 +112,7 @@
 		${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries \
 		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
 .if !defined(DISPLAY)
-BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
+BUILD_DEPENDS+=	Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -125,16 +125,16 @@
 USE_BISON=	yes
 USE_GMAKE=	yes
 
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
+EXTRACT_BEFORE_ARGS_R=	-dc
+EXTRACT_AFTER_ARGS_R=	| ${TAR} -xf -
+EXTRACT_CMD_R=	${GZIP_CMD}
 EXTRACT_REST=	gpc231.tar.Z
 
 JDKDIR?=	${LOCALBASE}/jdk1.4.2
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER= 253
+USE_AUTOCONF_VER=	253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${FRELEASE_NR}_src/config_office
 .if defined(WITH_DEBUG)
Index: ports/editors/openoffice-2.0-devel/Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/openoffice-2.0-devel/Makefile,v
retrieving revision 1.116
diff -u -r1.116 Makefile
--- ports/editors/openoffice-2.0-devel/Makefile	16 Mar 2004 22:54:02 -0000	1.116
+++ ports/editors/openoffice-2.0-devel/Makefile	8 Apr 2004 14:48:12 -0000
@@ -43,7 +43,7 @@
 FRELEASE_NR=		1.1.0
 INSTALLATION_BASEDIR=	OpenOffice.org${FRELEASE_NR}
 DIST_SUBDIR=		openoffice1.1
-DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
+DICT_DIR=		${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
 
 #
 # configuration for language specific slave ports
@@ -90,10 +90,10 @@
 
 .if ${OSVERSION} < 500000
 # OOo requires gcc 3.3 (not systems's gcc)
-BUILD_DEPENDS+= gcc33:${PORTSDIR}/lang/gcc33
+BUILD_DEPENDS+=	gcc33:${PORTSDIR}/lang/gcc33
 USE_GCC=3.3 # make no sense yet
-CC=  gcc33
-CXX= g++33
+CC=	gcc33
+CXX=	g++33
 .endif
 
 EXTRACT_ONLY=	OOo_${PORTVERSION}_source.tar.bz2
@@ -108,15 +108,15 @@
 # The JDK dependency needs to be at the first place, so all
 # following dependencies use the same JDK.
 #
-BUILD_DEPENDS+= ${JAVAVM}:${PORTSDIR}/java/jdk14
-BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip
+BUILD_DEPENDS+=	${JAVAVM}:${PORTSDIR}/java/jdk14
+BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
 BUILD_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 BUILD_DEPENDS+=	${ANT}:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS+=	${X11BASE}/lib/libgdk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20
-BUILD_DEPENDS+= ${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
-BUILD_DEPENDS+= ${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
+BUILD_DEPENDS+=	${X11BASE}/lib/libX11.so:${PORTSDIR}/x11/XFree86-4-libraries
+BUILD_DEPENDS+=	${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft
 .if !defined(DISPLAY)
-BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
+BUILD_DEPENDS+=	Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer
 .endif
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
@@ -130,16 +130,16 @@
 USE_GMAKE=	yes
 USE_GNOME=	orbit gtk12
 
-EXTRACT_BEFORE_ARGS_R= -dc
-EXTRACT_AFTER_ARGS_R= | ${TAR} -xf -
-EXTRACT_CMD_R= ${GZIP_CMD}
+EXTRACT_BEFORE_ARGS_R=	-dc
+EXTRACT_AFTER_ARGS_R=	| ${TAR} -xf -
+EXTRACT_CMD_R=	${GZIP_CMD}
 EXTRACT_REST=	gpc231.tar.Z
 
 JDKDIR?=	${LOCALBASE}/jdk1.4.1
 JAVAVM=		${JDKDIR}/bin/java
 
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER= 253
+USE_AUTOCONF_VER=	253
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 LD_PATH1=	${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/
Index: ports/japanese/openoffice-1.0/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/openoffice-1.0/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- ports/japanese/openoffice-1.0/Makefile	9 Nov 2003 14:11:27 -0000	1.13
+++ ports/japanese/openoffice-1.0/Makefile	8 Apr 2004 17:38:18 -0000
@@ -13,5 +13,5 @@
 MASTERDIR=	${.CURDIR}/../../editors/openoffice-1.0
 RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTSDIR}/japanese/kochi-ttfonts
 
-L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
 .include "${MASTERDIR}/Makefile"
Index: ports/korean/openoffice-1.1/Makefile
===================================================================
RCS file: /home/ncvs/ports/korean/openoffice-1.1/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- ports/korean/openoffice-1.1/Makefile	15 Nov 2003 10:29:34 -0000	1.3
+++ ports/korean/openoffice-1.1/Makefile	8 Apr 2004 17:40:15 -0000
@@ -11,6 +11,6 @@
 LANG_EXT=	82
 LANG_CONFIGURE_ARG=	KOREAN
 MASTERDIR=	${.CURDIR}/../../editors/openoffice-1.1
-L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
 
 .include "${MASTERDIR}/Makefile"
Index: ports/russian/openoffice-1.0/Makefile
===================================================================
RCS file: /home/ncvs/ports/russian/openoffice-1.0/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- ports/russian/openoffice-1.0/Makefile	9 Nov 2003 14:11:29 -0000	1.9
+++ ports/russian/openoffice-1.0/Makefile	8 Apr 2004 16:58:02 -0000
@@ -5,7 +5,7 @@
 # $FreeBSD: ports/russian/openoffice-1.0/Makefile,v 1.9 2003/11/09 14:11:29 maho Exp $
 #
 
-CATEGORIES=     russian
+CATEGORIES=	russian
 
 .if !defined (LANG) && !defined(USE_LANG)
 USE_LANG=	ru_RU.KOI8-R
Index: ports/russian/openoffice-1.1/Makefile
===================================================================
RCS file: /home/ncvs/ports/russian/openoffice-1.1/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- ports/russian/openoffice-1.1/Makefile	14 Nov 2003 01:51:17 -0000	1.3
+++ ports/russian/openoffice-1.1/Makefile	8 Apr 2004 16:58:31 -0000
@@ -1,11 +1,11 @@
 # New ports collection makefile for:	OpenOffice.org for Russian language
-# Date created:		 Sun Nov 9 9:19:23 2003 JST 
+# Date created:		 Sun Nov 9 9:19:23 2003 JST
 # Whom:		Martin Blapp <mbr@FreeBSD.org>, Mario Ferreira <lioux@FreeBSD.org> and NAKATA Maho <maho@FreeBSD.org>
 #
 # $FreeBSD: ports/russian/openoffice-1.1/Makefile,v 1.3 2003/11/14 01:51:17 kan Exp $
 #
 
-CATEGORIES=     russian
+CATEGORIES=	russian
 
 .if !defined (LANG) && !defined(USE_LANG)
 USE_LANG=	ru_RU.KOI8-R



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200404202313.i3KNDfGA064071>