update to m103

3 files changed, 52 insertions, 15 deletions

diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index bf4362e2e48f..d4a65773b3c8 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -17,7 +17,6 @@ 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=	20050504
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20 gnomevfs2
 MOZILLA_SOURCE=		mozilla-source-${MOZILLA_VERSION}.tar.gz
@@ -49,7 +48,8 @@ BROKEN=		"rtld depends on _end symbol. type make -DTRYBROKEN to see how to upgra
 
 CODELINE=		680
 RELEASE_NR=		1.9
-MILESTONE=		101
+MILESTONE=		103
+SNAPDATE=		20050512
 INSTALLATION_BASEDIR=	openoffice.org${RELEASE_NR}m${MILESTONE}
 EXECBASE=		openoffice.org-${RELEASE_NR}m${MILESTONE}
 DIST_SUBDIR=		openoffice.org2.0
@@ -98,9 +98,8 @@ USE_AUTOCONF_VER=	259
 WRKSRC=		${WRKDIR}
 CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 ANT?=		${LOCALBASE}/bin/ant
-TCSH?=		/bin/tcsh
 ZIP?=		${PREFIX}/bin/zip
-UNZIP?=		${PREFIX}/bin/unzip
+TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 NUMOFPROCESSES?=	1
 
@@ -138,11 +137,11 @@ post-extract:
 
 do-build:
 	@cd ${WRKSRC} ; ./bootstrap
-.if !defined(WITHOUT_MOZILLA)
-	@cd ${WRKSRC}/moz ; ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; deliver.pl ; dmake zip' 
+.if (${NUMOFPROCESSES}>1)
+	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes" ${TCSH} -c "source FreeBSDEnv.Set ; cd instsetoo_native ; build.pl -P${NUMOFPROCESSES} --all"
+.else
+	@cd ${WRKSRC} ;	${SETENV} "DEFAULT_TO_ENGLISH_FOR_PACKING=yes"  ${TCSH} -c "source FreeBSDEnv.Set ; dmake"
 .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"
 
 do-install:
 	@cd ${WRKSRC}/instsetoo_native/unxfbsd.pro/OpenOffice/install/${LOCALIZED_LANG}/freebsd-*/ ; ${LS} *.sw > ${WRKDIR}/INSTALLFILES
diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo
index 5e0a0fa0e6dc..9c859bca1d4d 100644
--- a/editors/openoffice.org-2.0/distinfo
+++ b/editors/openoffice.org-2.0/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice.org2.0/OOo_1.9m101_source.tar.bz2) = a3965d9cb05fb01ba8e2dc65c720a469
-SIZE (openoffice.org2.0/OOo_1.9m101_source.tar.bz2) = 214061915
+MD5 (openoffice.org2.0/OOo_1.9m103_source.tar.bz2) = 65c42ee71a3bca66ef38a332826f2ef7
+SIZE (openoffice.org2.0/OOo_1.9m103_source.tar.bz2) = 214220004
 MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice.org2.0/mozilla-source-1.7.5.tar.gz) = d3f3528b6c5eade402ed058207cffa14
diff --git a/editors/openoffice.org-2.0/files/patch-portaudio+portaudio_v18_1.patch b/editors/openoffice.org-2.0/files/patch-portaudio+portaudio_v18_1.patch
index 37e9c1d25f98..87c43fb14d7c 100644
--- a/editors/openoffice.org-2.0/files/patch-portaudio+portaudio_v18_1.patch
+++ b/editors/openoffice.org-2.0/files/patch-portaudio+portaudio_v18_1.patch
@@ -1,7 +1,8 @@
-Issutracker : #iXXXXX#
+Issutracker : #i46879#
 CWS         : N/A
 Author      : NAKATA Maho <maho@openoffice.org> (JCA)
-Description : Need to include <sys/soundcard.h> to use sound
+Description : Need to include <sys/soundcard.h> to use sound and passes
+              correct pthread related flags
 
 Index: portaudio/portaudio_v18_1.patch
 ===================================================================
@@ -9,13 +10,49 @@ RCS file: /cvs/external/portaudio/portaudio_v18_1.patch,v
 retrieving revision 1.1
 diff -u -r1.1 portaudio_v18_1.patch
 --- portaudio/portaudio_v18_1.patch	6 Oct 2004 11:48:04 -0000	1.1
-+++ portaudio/portaudio_v18_1.patch	28 Mar 2005 06:55:37 -0000
-@@ -52,3 +52,16 @@
++++ portaudio/portaudio_v18_1.patch	13 May 2005 23:27:21 -0000
+@@ -12,7 +12,7 @@
+   	;;
+   
+     mingw* )
+---- 1883,1902 ----
++--- 1883,1921 ----
+   case "${host_os}" in
+     darwin* )
+   
+@@ -30,6 +30,25 @@
+ ! 	PADLL="libportaudio.so";
+ ! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
+ ! 	CFLAGS="-O2 -fPIC"
++! 	;;
++! 
++!   freebsd* )
++! 	if test "$OSVERSION" -lt "500016"; then
++!              PTHREAD_CFLAGS="-D_THREAD_SAFE"
++!              PTHREAD_LIBS="-pthread"
++!         elif test "$OSVERSION" -lt "502102"; then
++!              PTHREAD_CFLAGS="-D_THREAD_SAFE"
++!              PTHREAD_LIBS="-lc_r"
++!         else
++!              PTHREAD_CFLAGS=""
++!              PTHREAD_LIBS="-pthread"
++!         fi
++! 
++! 	OTHER_OBJS="pa_unix_oss/pa_unix_oss.o pa_unix_oss/pa_unix.o";
++! 	LIBS="-lm ${PTHREAD_LIBS}";
++! 	PADLL="libportaudio.so";
++! 	SHARED_FLAGS="-shared -Wl,-soname=libportaudio.so.0";
++! 	CFLAGS="-O2 -fPIC ${PTHREAD_CFLAGS}"
+   	;;
+   
+     mingw* )
+@@ -52,3 +71,18 @@
    LIBINST = /usr/local/lib
    
    TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
++
 +*** misc/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Tue Jul  1 00:05:50 2003
-+--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Mon Mar 28 15:45:37 2005
++--- misc/build/portaudio_v18_1/pa_unix_oss/pa_unix_oss.c	Sat May 14 08:14:16 2005
 +***************
 +*** 43,48 ****
 +--- 43,50 ----
@@ -27,3 +64,4 @@ diff -u -r1.1 portaudio_v18_1.patch
 +  #else
 +  #include <machine/soundcard.h> /* JH20010905 */
 +  #endif
++