o clean up (cosmetic change)

o update to 2004/Aug/10 cws_src645_ooo113fix2 snapshot
o correct version number (not 1.1.3 but 1.1.3.${SNAPDATE})
o add seven localized langs, sort Makefile @my LANGUAGES in
  config_office/set_soenv.in

3 files changed, 98 insertions, 53 deletions

diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index e673bfbc6ec6..954a633e494b 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	openoffice
-PORTVERSION=	1.1.3
+PORTVERSION=	1.1.3.${SNAPDATE}
 CATEGORIES+=	editors
-MASTER_SITES+=  ${MASTER_SITE_LOCAL} \
+MASTER_SITES+=	${MASTER_SITE_LOCAL} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		http://people.freebsd.org/~mbr/ooo/:moz \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/contrib/helpcontent/&,}:help \
@@ -16,18 +16,20 @@ MASTER_SITES+=  ${MASTER_SITE_LOCAL} \
 		ftp://sunsite.cnlab-switch.ch/mirror/OpenOffice/contrib/helpcontent/:help \
 		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help
 MASTER_SITE_SUBDIR=	maho/openoffice.org
-DISTFILES+=	OOo_${PORTVERSION}.${SNAPDATE}_source.tar.bz2 gpc231.tar.Z:gpc \
+DISTFILES+=	OOo_${PORTVERSION}_source.tar.bz2 gpc231.tar.Z:gpc \
 		patch-openoffice-mozilla101-2002-10-14:moz mozilla-vendor-1.0.2a.tgz:moz
-EXTRACT_ONLY=	OOo_${PORTVERSION}.${SNAPDATE}_source.tar.bz2
+EXTRACT_ONLY=	OOo_${PORTVERSION}_source.tar.bz2
 
-NO_LATEST_LINK=		yes
+MAINTAINER=	openoffice@FreeBSD.org
+
+SNAPDATE=	20040810
+NO_LATEST_LINK=	yes
 USE_GNOME=	orbit gtk12 gtk20
 USE_PERL5=	yes
 USE_BISON=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_BZIP2=	yes
-SNAPDATE=	20040729
 
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.localized>
@@ -51,11 +53,10 @@ L10NHELPS=	helpcontent_31_unix.tgz helpcontent_33_unix.tgz \
 BROKEN=		"Does not compile on 5-current"
 .endif
 
-MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
 
 BUILD_NR=		645
-RELEASE_NR=		${PORTVERSION}
+RELEASE_NR=		1.1.3
 INSTALLATION_BASEDIR=	OpenOffice.org${RELEASE_NR}
 DIST_SUBDIR=		openoffice1.1
 SIMPLEOSVER!=		${UNAME} -r | ${SED} -e 's/\.//' | ${SED} -e 's/\..*//'
@@ -65,7 +66,7 @@ PKGNAMEPREFIX=		${LANG_PKGNAME}-
 .if defined(LANG_SUFFIX)
 PKGNAMESUFFIX?=		-${LANG_SUFFIX}
 .endif
-BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32
+BUILD_DEPENDS+=	gcc32:${PORTSDIR}/lang/gcc32
 USE_GCC=3.2
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
@@ -76,7 +77,7 @@ CC=	gcc32
 CXX=	g++32
 .endif
 
-BUILD_DEPENDS+= ${JDKDIR}/bin/java:${PORTSDIR}/java/jdk14 \
+BUILD_DEPENDS+=	${JDKDIR}/bin/java:${PORTSDIR}/java/jdk14 \
 		zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
@@ -92,7 +93,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 
 JDKDIR?=	${LOCALBASE}/jdk1.4.2
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=	253
+USE_AUTOCONF_VER=	259
 WRKDIR=		${WRKDIRPREFIX}${.CURDIR}/work
 WRKSRC=		${WRKDIR}/oo_${RELEASE_NR}_src/config_office
 ANT?=		${LOCALBASE}/bin/ant
@@ -116,7 +117,7 @@ LANG_EXT=		01
 .endif
 
 .if defined(ALL_LOCALIZED_LANGS)
-CONFIGURE_ARGS+=        --with-lang=ALL
+CONFIGURE_ARGS+=	--with-lang=ALL
 .endif
 
 .if defined(WITH_DEBUG)
diff --git a/editors/openoffice-1.1-devel/distinfo b/editors/openoffice-1.1-devel/distinfo
index 9f985e7973d7..3afb6040f58b 100644
--- a/editors/openoffice-1.1-devel/distinfo
+++ b/editors/openoffice-1.1-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice1.1/OOo_1.1.2.20040518_source.tar.bz2) = 5a9ae3b93e769c98725d3a63b00b4552
-SIZE (openoffice1.1/OOo_1.1.2.20040518_source.tar.bz2) = 189150550
+MD5 (openoffice1.1/OOo_1.1.3.20040810_source.tar.bz2) = 86f1d320b1a644ed97db649e18ceafe0
+SIZE (openoffice1.1/OOo_1.1.3.20040810_source.tar.bz2) = 201561173
 MD5 (openoffice1.1/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice1.1/gpc231.tar.Z) = 27917
 MD5 (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 463058a33377a9226f919d00e39dc28a
diff --git a/editors/openoffice-1.1-devel/files/Makefile.localized b/editors/openoffice-1.1-devel/files/Makefile.localized
index a4ccdda570ee..226e649100a7 100644
--- a/editors/openoffice-1.1-devel/files/Makefile.localized
+++ b/editors/openoffice-1.1-devel/files/Makefile.localized
@@ -1,6 +1,6 @@
 # localized makefile
 # Whom:         Maho Nakata <maho@FreeBSD.org>
-# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.1-devel/files/Attic/Makefile.localized,v 1.2 2004-08-05 04:46:34 maho Exp $
+# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-1.1-devel/files/Attic/Makefile.localized,v 1.3 2004-08-11 00:36:27 maho Exp $
 
 ################################################################
 .if defined(LOCALIZED_LANG)
@@ -17,12 +17,38 @@ LANG_EXT=       96
 LANG_CONFIGURE_ARG=     ARAB
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "eu"
+LANG_PKGNAME=   eu
+LANG_EXT=       10
+LANG_CONFIGURE_ARG=     BASQUE
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "ca"
 LANG_PKGNAME=   ca
 LANG_EXT=       37
 LANG_CONFIGURE_ARG=     CAT
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "zh-CN"
+CATEGORIES=	chinese
+LANG_PKGNAME=	zh
+LANG_SUFFIX=	CN
+LANG_EXT=       86
+LANG_CONFIGURE_ARG=	CHINSIM
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "zh-TW"
+CATEGORIES=	chinese
+LANG_PKGNAME=	zh
+LANG_SUFFIX=	TW
+LANG_EXT=	88
+LANG_CONFIGURE_ARG=	CHINTRAD
+BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "cs"
 LANG_PKGNAME=   cs
 LANG_EXT=       42
@@ -35,17 +61,11 @@ LANG_EXT=       45
 LANG_CONFIGURE_ARG=     DAN
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "el"
-LANG_PKGNAME=   el
-LANG_EXT=       30
-LANG_CONFIGURE_ARG=     GREEK
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "es"
-LANG_PKGNAME=   es
-LANG_EXT=       34
-L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
-LANG_CONFIGURE_ARG=     SPAN
+.if ${LOCALIZED_LANG} == "nl"
+LANG_PKGNAME=	nl
+LANG_EXT=	31
+L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=	DTCH
 .endif
 ################################################################
 .if ${LOCALIZED_LANG} == "et"
@@ -68,6 +88,13 @@ L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
 LANG_CONFIGURE_ARG=     FREN
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "gl-ES"
+LANG_PKGNAME=	gl
+LANG_SUFFIX=	ES
+LANG_EXT=       38
+LANG_CONFIGURE_ARG=     GAL
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "de"
 CATEGORIES=	german
 LANG_PKGNAME=	de
@@ -78,12 +105,24 @@ COMMENT=	Office-Suite mit Textverarbeitung, Tabellenkalkulation, Datenbank und P
 PKGMESSAGE=     ${FILESDIR}/pkg-message.de
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "el"
+LANG_PKGNAME=   el
+LANG_EXT=       30
+LANG_CONFIGURE_ARG=     GREEK
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "he"
 LANG_PKGNAME=   he
 LANG_EXT=       97
 LANG_CONFIGURE_ARG=     HEBREW
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "hi-IN"
+LANG_PKGNAME=   hi
+LANG_EXT=       91
+LANG_CONFIGURE_ARG=     HINDI
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "hu"
 CATEGORIES=     hungarian
 LANG_PKGNAME=   hu
@@ -108,6 +147,13 @@ RUN_DEPENDS+=   ${X11BASE}/lib/X11/fonts/TrueType/kochi-mincho-subst.ttf:${PORTS
 L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "kn-IN"
+LANG_PKGNAME=   kn
+LANG_SUFFIX=	IN
+LANG_EXT=       93
+LANG_CONFIGURE_ARG=     KANNADA
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "ko"
 CATEGORIES=     korean
 LANG_PKGNAME=   ko
@@ -116,19 +162,18 @@ LANG_CONFIGURE_ARG=     KOREAN
 L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "lt"
+LANG_PKGNAME=   lt
+LANG_EXT=	58
+LANG_CONFIGURE_ARG=     LITHUANIAN
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "nb"
 LANG_PKGNAME=   nb
 LANG_EXT=       47
 LANG_CONFIGURE_ARG=     NORBOK
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "nl"
-LANG_PKGNAME=	nl
-LANG_EXT=	31
-L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
-LANG_CONFIGURE_ARG=	DTCH
-.endif
-################################################################
 .if ${LOCALIZED_LANG} == "nn"
 LANG_PKGNAME=   nn
 LANG_EXT=       79
@@ -173,6 +218,13 @@ LANG_EXT=	07
 LANG_CONFIGURE_ARG=	RUSS
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "es"
+LANG_PKGNAME=   es
+LANG_EXT=       34
+L10NHELP=       helpcontent_${LANG_EXT}_unix.tgz
+LANG_CONFIGURE_ARG=     SPAN
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "sv"
 LANG_PKGNAME=	sv
 LANG_EXT=	46
@@ -193,6 +245,18 @@ LANG_EXT=	50
 LANG_CONFIGURE_ARG=	SLOVENIAN
 .endif
 ################################################################
+.if ${LOCALIZED_LANG} == "th"
+LANG_PKGNAME=	th
+LANG_EXT=	66
+LANG_CONFIGURE_ARG=	THAI
+.endif
+################################################################
+.if ${LOCALIZED_LANG} == "tn"
+LANG_PKGNAME=	tn
+LANG_EXT=	29
+LANG_CONFIGURE_ARG=	TSWANA
+.endif
+################################################################
 .if ${LOCALIZED_LANG} == "tr"
 LANG_PKGNAME=	tr
 LANG_EXT=	90
@@ -205,26 +269,6 @@ LANG_EXT=       53
 LANG_CONFIGURE_ARG=     WELSH
 .endif
 ################################################################
-.if ${LOCALIZED_LANG} == "zh-CN"
-CATEGORIES=	chinese
-LANG_PKGNAME=	zh
-LANG_SUFFIX=	CN
-LANG_EXT=       86
-LANG_CONFIGURE_ARG=	CHINSIM
-BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/gbsn00lp.ttf:${PORTSDIR}/chinese/arphicttf
-L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
-.endif
-################################################################
-.if ${LOCALIZED_LANG} == "zh-TW"
-CATEGORIES=	chinese
-LANG_PKGNAME=	zh
-LANG_SUFFIX=	TW
-LANG_EXT=	88
-LANG_CONFIGURE_ARG=	CHINTRAD
-BUILD_DEPENDS+=	${PREFIX}/share/fonts/TrueType/bsmi00lp.ttf:${PORTSDIR}/chinese/arphicttf
-L10NHELP=	helpcontent_${LANG_EXT}_unix.tgz
-.endif
-################################################################
 .if ${LOCALIZED_LANG} == "zu"
 LANG_PKGNAME=   zu
 LANG_EXT=       28