Update to 1.9m83

fix typo at Makefile.knob[1]
Submitted by: Hiromi Kimura <hiromi@tac.tsukuba.ac.jp> [1]

4 files changed, 9 insertions, 22 deletions

diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index fdf884a0e930..82509858e26a 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -9,7 +9,6 @@ PORTNAME=	openoffice
 PORTVERSION=	2.0.${SNAPDATE}
 CATEGORIES+=	editors
 MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
-		${MASTER_SITE_LOCAL:S,%SUBDIR%,maho/openoffice.org/&,}:mozprj \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla${MOZILLA_VERSION}/&,}source/:mozsrc
 DISTFILES+=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2 gpc231.tar.Z:gpc
@@ -18,14 +17,13 @@ EXTRACT_ONLY=	OOo_${RELEASE_NR}m${MILESTONE}_source.tar.bz2
 MAINTAINER=	openoffice@FreeBSD.org
 COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-SNAPDATE=	20050302
+SNAPDATE=	20050305
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
-MOZILLA_PROJECT=	cws_srx645_mozooo.20050212.tar.gz
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
 MOZILLA_VERSION=	1.7.5
 .if !defined(WITHOUT_MOZILLA)
-DISTFILES+=	${MOZILLA_PROJECT}:mozprj ${MOZILLA_SOURCE}:mozsrc
+DISTFILES+=	${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	orbit gtk12
 .endif
 
@@ -49,7 +47,7 @@ BROKEN=		"rtld depends on _end symbol. type make -DBROKEN to see how to upgrade
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		82
+MILESTONE=		83
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -135,14 +133,13 @@ post-extract:
 	@${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/external/gpc/
 	@${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/external/gpc/
 .if !defined(WITHOUT_MOZILLA)
-	@cd ${WRKSRC} ; ${RM} -rf moz ; ${TAR} xfz ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_PROJECT}
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${MOZILLA_SOURCE} ${WRKSRC}/moz/download
 .endif
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
 .if !defined(WITHOUT_MOZILLA)
-	@cd ${WRKSRC}/moz ; ${SETENV} "BUILD_MOZAB=TRUE" ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; deliver.pl ; dmake zip' ; ${CP} unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped
+	@cd ${WRKSRC}/moz ; ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; deliver.pl ; dmake zip' ; ${CP} unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped
 .endif
 #DEFAULT_TO_ENGLISH_FOR_PACKING=yes, see #iz 35659, 34269 and 36708
 	cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
index 01a84cd42616..adf947407783 100644
--- a/editors/openoffice.org-2-RC/distinfo
+++ b/editors/openoffice.org-2-RC/distinfo
@@ -1,8 +1,6 @@
-MD5 (openoffice.org2.0/OOo_1.9m82_source.tar.bz2) = 5beaa95c27d693353b574ae0553d5e68
-SIZE (openoffice.org2.0/OOo_1.9m82_source.tar.bz2) = 241645781
+MD5 (openoffice.org2.0/OOo_1.9m83_source.tar.bz2) = 9f0741ab83491009f8c43e19bb9f2a63
+SIZE (openoffice.org2.0/OOo_1.9m83_source.tar.bz2) = 243524822
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
-MD5 (openoffice.org2.0/cws_srx645_mozooo.20050212.tar.gz) = c9a586096edd32a1c4fd138d88fa6c5e
-SIZE (openoffice.org2.0/cws_srx645_mozooo.20050212.tar.gz) = 114582
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
 SIZE (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = 38721366
diff --git a/editors/openoffice.org-2-RC/files/Makefile.knobs b/editors/openoffice.org-2-RC/files/Makefile.knobs
index 168c0024b0d5..df7cc8c5e058 100644
--- a/editors/openoffice.org-2-RC/files/Makefile.knobs
+++ b/editors/openoffice.org-2-RC/files/Makefile.knobs
@@ -18,6 +18,8 @@ CONFIGURE_ARGS+=	--enable-kde
 
 .if defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+=	--disable-mozilla
+.else
+CONFIGURE_ARGS+=	--enable-build-mozilla
 .endif
 
 .if defined(WITH_CUPS)
@@ -44,7 +46,7 @@ pre-fetch:
 	@${ECHO}
 	@${ECHO} "WARNING"
 	@${ECHO} "Your rtld seems to be old."
-	@${ECHO} "Please remake your rtld by:
+	@${ECHO} "Please remake your rtld by:"
 	@${ECHO} "[1] if you use 4-series:"
 	@${ECHO} "# fetch http://people.freebsd.org/~maho/ooo/patch-rtld.c-releng4"
 	@${ECHO} "# cd /usr/src/libexec/rtld-elf ; patch < patch-rtld.c-releng4"
diff --git a/editors/openoffice.org-2-RC/files/patch-linguistic+prj+build.lst b/editors/openoffice.org-2-RC/files/patch-linguistic+prj+build.lst
deleted file mode 100644
index 8d016c24747e..000000000000
--- a/editors/openoffice.org-2-RC/files/patch-linguistic+prj+build.lst
+++ /dev/null
@@ -1,10 +0,0 @@
-#i 43496
-
---- linguistic/prj/build.lst	2005-02-25 21:46:37.622273840 +0900
-+++ linguistic/prj/build.lst	2001-02-23 23:04:06.000000000 +0900
-@@ -1,4 +1,4 @@
--lg	linguistic	:	sfx2 NULL
-+lg	linguistic	:	xmloff sfx2 NULL
- lg	linguistic								usr1	-	all	lg_mkout NULL
- lg	linguistic\prj							get		-	all	lg_prj NULL
- lg	linguistic\inc							get		-	all	lg_inc NULL