Update to cws_srx645_ooo112fix2, checking out by 2004/May/18th

8 files changed, 48 insertions, 54 deletions

diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index 19f190db6841..3046bdcb30f7 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -37,7 +37,7 @@ USE_REINPLACE=	yes
 BUILD_NR=		645
 RELEASE_NR=		1.1
 FRELEASE_NR=		1.1.2
-SNAPDATE=		20040408
+SNAPDATE=		20040518
 INSTALLATION_BASEDIR=	OpenOffice.org${FRELEASE_NR}
 DIST_SUBDIR=		openoffice1.1
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
@@ -50,14 +50,14 @@ SIMPLEOSVER!=		${UNAME} -r | sed -e 's/\.//' | sed -e 's/\..*//'
 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
 #
@@ -152,7 +152,7 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --enable-mozilla=no --with-jdk-home=${JDKDIR}
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-jdk-home=${JDKDIR}
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -321,7 +321,7 @@ post-extract:
 	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
 	@cd ${WRKDIR}/L10NHELP && \
-		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf - 
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
 .endif
 
 post-patch:
@@ -555,7 +555,6 @@ sdk:
 .endif
 	${MV} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/OpenOffice.org${FRELEASE_NR}_SDK.tar.gz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_sdk.tar.gz 
 
-
 solver:
 	@${ECHO_MSG} "===>   Make Solver of OpenOffice.org"
 	@cd ${WRKSRC}/.. ; ${TAR} cfz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_solver.tar.gz solver
diff --git a/editors/openoffice-1.1-devel/distinfo b/editors/openoffice-1.1-devel/distinfo
index a8175e431758..0ec7845908c8 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.20040408_source.tar.bz2) = d4d721c9f6f1505611cedbe8884ea665
-SIZE (openoffice1.1/OOo_1.1.2.20040408_source.tar.bz2) = 194210597
+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/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/patch-setup2+wrapper+install.sh b/editors/openoffice-1.1-devel/files/patch-setup2+wrapper+install.sh
deleted file mode 100644
index 0ab0e49caeca..000000000000
--- a/editors/openoffice-1.1-devel/files/patch-setup2+wrapper+install.sh
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../setup2/wrapper/install.sh.org	Fri Apr  9 17:29:34 2004
-+++ ../setup2/wrapper/install.sh	Sat Jan 10 03:53:17 2004
-@@ -4,8 +4,8 @@
- cd `dirname $0`
- 
- # Set the Defaults Here
--oo_version="OpenOffice.org 1.1.1"
--oo_home=OpenOffice.org1.1.1
-+oo_version="OpenOffice.org 1.1.2"
-+oo_home=OpenOffice.org1.1.2
- oo_default_prefix=/usr/local
- oo_default_netflg=-net
- oo_default_interact=no
diff --git a/editors/openoffice-1.1-devel/files/patch-solenv+bin+deliver.pl b/editors/openoffice-1.1-devel/files/patch-solenv+bin+deliver.pl
new file mode 100644
index 000000000000..34a838d116f4
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-solenv+bin+deliver.pl
@@ -0,0 +1,11 @@
+http://www.openoffice.org/issues/show_bug.cgi?id=29286
+--- ../solenv/bin/deliver.pl.old	Mon May 10 18:46:11 2004
++++ ../solenv/bin/deliver.pl	Tue May 18 09:10:47 2004
+@@ -138,6 +138,7 @@
+ };
+ $strip 		= '/usr/ccs/bin/strip' if ( $^O eq 'solaris' );
+ $strip 		= 'strip' if ( $^O eq "darwin" );
++$strip 		= 'strip' if ( $^O eq "freebsd" );
+ $upd           = $ENV{'UPD'};
+ ($gui		= lc($ENV{GUI})) 		|| die "can't determine GUI";
+ 
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index 19f190db6841..3046bdcb30f7 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -37,7 +37,7 @@ USE_REINPLACE=	yes
 BUILD_NR=		645
 RELEASE_NR=		1.1
 FRELEASE_NR=		1.1.2
-SNAPDATE=		20040408
+SNAPDATE=		20040518
 INSTALLATION_BASEDIR=	OpenOffice.org${FRELEASE_NR}
 DIST_SUBDIR=		openoffice1.1
 DICT_DIR=               ${PREFIX}/${INSTALLATION_BASEDIR}/share/dict/ooo/
@@ -50,14 +50,14 @@ SIMPLEOSVER!=		${UNAME} -r | sed -e 's/\.//' | sed -e 's/\..*//'
 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
 #
@@ -152,7 +152,7 @@ DISPLAYHACK=localhost:1001
 
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
-CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --enable-mozilla=no --with-jdk-home=${JDKDIR}
+CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp --with-jdk-home=${JDKDIR}
 
 .if defined(WITH_DEBUG)
 .if ${WITH_DEBUG} == 2
@@ -321,7 +321,7 @@ post-extract:
 	@${ECHO_MSG} "===>  Extracting L10NHELP sub project"
 	@${MKDIR} ${WRKDIR}/L10NHELP
 	@cd ${WRKDIR}/L10NHELP && \
-		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf - 
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/${L10NHELP} | ${GZIP_CMD} -d | ${TAR} xf -
 .endif
 
 post-patch:
@@ -555,7 +555,6 @@ sdk:
 .endif
 	${MV} ${WRKSRC}/../solver/${BUILD_NR}/unxfbsd.pro/bin/OpenOffice.org${FRELEASE_NR}_SDK.tar.gz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_sdk.tar.gz 
 
-
 solver:
 	@${ECHO_MSG} "===>   Make Solver of OpenOffice.org"
 	@cd ${WRKSRC}/.. ; ${TAR} cfz ${WRKDIR}/../OOo_${PORTVERSION}_${OPSYS}${SIMPLEOSVER}Intel_solver.tar.gz solver
diff --git a/editors/openoffice.org-1.1-devel/distinfo b/editors/openoffice.org-1.1-devel/distinfo
index a8175e431758..0ec7845908c8 100644
--- a/editors/openoffice.org-1.1-devel/distinfo
+++ b/editors/openoffice.org-1.1-devel/distinfo
@@ -1,5 +1,5 @@
-MD5 (openoffice1.1/OOo_1.1.2.20040408_source.tar.bz2) = d4d721c9f6f1505611cedbe8884ea665
-SIZE (openoffice1.1/OOo_1.1.2.20040408_source.tar.bz2) = 194210597
+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/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.org-1.1-devel/files/patch-setup2+wrapper+install.sh b/editors/openoffice.org-1.1-devel/files/patch-setup2+wrapper+install.sh
deleted file mode 100644
index 0ab0e49caeca..000000000000
--- a/editors/openoffice.org-1.1-devel/files/patch-setup2+wrapper+install.sh
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../setup2/wrapper/install.sh.org	Fri Apr  9 17:29:34 2004
-+++ ../setup2/wrapper/install.sh	Sat Jan 10 03:53:17 2004
-@@ -4,8 +4,8 @@
- cd `dirname $0`
- 
- # Set the Defaults Here
--oo_version="OpenOffice.org 1.1.1"
--oo_home=OpenOffice.org1.1.1
-+oo_version="OpenOffice.org 1.1.2"
-+oo_home=OpenOffice.org1.1.2
- oo_default_prefix=/usr/local
- oo_default_netflg=-net
- oo_default_interact=no
diff --git a/editors/openoffice.org-1.1-devel/files/patch-solenv+bin+deliver.pl b/editors/openoffice.org-1.1-devel/files/patch-solenv+bin+deliver.pl
new file mode 100644
index 000000000000..34a838d116f4
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-solenv+bin+deliver.pl
@@ -0,0 +1,11 @@
+http://www.openoffice.org/issues/show_bug.cgi?id=29286
+--- ../solenv/bin/deliver.pl.old	Mon May 10 18:46:11 2004
++++ ../solenv/bin/deliver.pl	Tue May 18 09:10:47 2004
+@@ -138,6 +138,7 @@
+ };
+ $strip 		= '/usr/ccs/bin/strip' if ( $^O eq 'solaris' );
+ $strip 		= 'strip' if ( $^O eq "darwin" );
++$strip 		= 'strip' if ( $^O eq "freebsd" );
+ $upd           = $ENV{'UPD'};
+ ($gui		= lc($ENV{GUI})) 		|| die "can't determine GUI";
+