4 files changed, 153 insertions, 15 deletions

diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
index 236977e90c31..28a6495c5d01 100644
--- a/editors/openoffice.org-1.0/Makefile
+++ b/editors/openoffice.org-1.0/Makefile
@@ -8,17 +8,19 @@
 PORTNAME=	openoffice.org
 PORTVERSION=	1.0.3
 PORTREVISION=	7
-CATEGORIES+=	editors
-MASTER_SITES+=	ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/1.0.3/  \
+CATEGORIES+=	editors java
+MASTER_SITES+=	http://openoffice.lunarshells.com/sources/ \
+		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/1.0.3/  \
 		${MASTER_SITE_LOCAL:S/$/:moz/} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_MOZILLA:S/$/:mozsrc/} \
-		${MASTER_SITE_RINGSERVER:S/$/:help/} \
-		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent-1.0/:help \
-		${MASTER_SITE_LOCAL:S/$/:ru/}
+		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/1.0.3/:help \
+		http://openoffice.lunarshells.com/sources/helpcontent/:help \
+		${MASTER_SITE_LOCAL:S/$/:ru/} \
+		http://openoffice.lunarshells.com/sources/:ru \
+		ftp://ooopackages.good-day.net/pub/OpenOffice.org/sources/1.0.3/:ru
 MASTER_SITE_SUBDIR+= maho/openoffice.org/:moz,ru \
 		mozilla/releases/mozilla${MOZILLA_VERSION}/src/:mozsrc \
-		misc/openoffice/contrib/helpcontent-1.0/:help
 DISTFILES+=	OOo_${RELEASE_NR}_source.tar.gz patch-translation-ru-1.0.3.bz2:ru
 .if defined(WITH_GPC)
 DISTFILES+=     gpc231.tar.Z:gpc
@@ -112,7 +114,7 @@ CONFIGURE_WRKSRC=	${WRKSRC}/config_office
 TCSH?=		/bin/tcsh
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-DISPLAYHACK=localhost:1001
+MAKE_ENV+=		DISPLAY="localhost:1001"
 CONFIGURE_ENV=		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 			PTHREAD_LIBS=${PTHREAD_LIBS}
 CONFIGURE_ARGS+=	--with-jdk-home="${JAVA_HOME}" \
@@ -184,7 +186,7 @@ do-build:
 .endif
 	${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
-	@cd ${WRKSRC} ; ${SETENV} "LC_ALL=C" "LANG=C" DISPLAY=${DISPLAYHACK} ${TCSH} -c 'source FreeBSDEnv.Set ; ${BUILD}'
+	@cd ${WRKSRC} ; ${SETENV} "LC_ALL=C" "LANG=C" ${TCSH} -c 'source FreeBSDEnv.Set ; ${BUILD}'
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 
@@ -195,7 +197,7 @@ do-install:
 .endif
 	@${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > ${WRKDIR}/.Xvfb.pid
 	@sleep 5
-	@${SETENV} "LC_ALL=C" "LANG=C" DISPLAY=${DISPLAYHACK} ${TCSH} -c "cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal ; ./install --prefix=${PREFIX}"
+	@${SETENV} "LC_ALL=C" "LANG=C" ${TCSH} -c "cd ${WRKSRC}/instsetoo/*.pro/${LANG_EXT}/normal ; ./install --prefix=${PREFIX}"
 	@-${CAT} ${WRKDIR}/.Xvfb.pid | ${XARGS} kill
 	@${RM} -f ${WRKDIR}/.Xvfb.pid
 #XXX temporary hack (contains space in dir name)
diff --git a/editors/openoffice.org-1.0/files/moz-patch b/editors/openoffice.org-1.0/files/moz-patch
index 2eafbc036881..659ccc0feb02 100644
--- a/editors/openoffice.org-1.0/files/moz-patch
+++ b/editors/openoffice.org-1.0/files/moz-patch
@@ -1,7 +1,14 @@
-o disable freetype2 support since build broken and
-  this functionality is not used at all.
-o reduce dependency (gtk is no longer needed)
-o GNUCOPY is not supported by 1.0 series
+#iZ 28398
+#iZ 11424
+
+http://qa.openoffice.org/issues/show_bug.cgi?id=28398
+http://qa.openoffice.org/issues/show_bug.cgi?id=11424
+
+disable freetype2 support since build broken and
+this functionality is not used at all.
+
+reduce dependency (gtk is no longer needed)
+GNUCOPY is not supported by 1.0 series
 
 --- moz/extractfiles.mk.org	Sat Oct 30 22:01:49 2004
 +++ moz/extractfiles.mk	Sat Oct 30 22:00:21 2004
@@ -19,7 +26,7 @@ o GNUCOPY is not supported by 1.0 series
 
 --- moz/mozilla-source-1.0.patch.org	Tue Feb 10 19:44:34 2004
 +++ moz/mozilla-source-1.0.patch	Sat Mar 19 12:51:35 2005
-@@ -4471,14 +4471,16 @@
+@@ -4471,14 +4471,17 @@
       return NS_OK;
   }
  
@@ -27,7 +34,7 @@ o GNUCOPY is not supported by 1.0 series
 +--- misc/build/mozilla/.mozconfig	Tue Jul 22 21:52:27 2003
  +++ misc/build/mozilla/.mozconfig	Mon Jul 28 15:07:20 2003
 -@@ -0,0 +1,8 @@
-+@@ -0,0 +1,10 @@
++@@ -0,0 +1,11 @@
  +ac_add_options --disable-tests
  +ac_add_options --disable-xprint
  +ac_add_options --without-system-zlib
@@ -35,6 +42,79 @@ o GNUCOPY is not supported by 1.0 series
  +ac_add_options --disable-debug
 ++ac_add_options --disable-freetype2
 ++ac_add_options --enable-default-toolkit=xlib
+++ac_add_options --disable-pedantic
  +ac_add_options --enable-optimize
  +ac_add_options --enable-crypto
  +ac_add_options --enable-strip
+@@ -4497,3 +4500,19 @@
+  endif
+  
+  # Windows equivalents
++
++--- misc/build/mozilla/xpcom/typelib/xpidl/xpidl.h	Wed Apr 10 12:38:31 2002
+++++ misc/build/mozilla/xpcom/typelib/xpidl/xpidl.h	Sat Oct 29 12:34:19 2005
++@@ -71,10 +71,10 @@
++  * parens, e.g. XPIDL_WARNING((foo, bar, "sil"))
++  *
++  * Probably best removed when we leave 6.5.  */
++-#define XPIDL_WARNING(x) IDL_tree_warning##x
+++#define XPIDL_WARNING(x) IDL_tree_warning x
++ #else
++ extern void xpidl_tree_warning(IDL_tree p, int level, const char *fmt, ...);
++-#define XPIDL_WARNING(x) xpidl_tree_warning##x
+++#define XPIDL_WARNING(x) xpidl_tree_warning x
++ #endif
++ 
++ /*
+--- moz/mozilla-source-1.0.patch~	Sun Sep 10 09:28:29 2006
++++ moz/mozilla-source-1.0.patch	Sun Sep 10 12:01:05 2006
+@@ -4516,3 +4516,49 @@
+  #endif
+  
+  /*
++*** misc/mozilla/configure	Tue May 28 04:29:00 2002
++--- misc/build/mozilla/configure	Sun Sep 10 11:56:33 2006
++***************
++*** 6589,6594 ****
++--- 6589,6596 ----
++  case $target in
++  *-hpux11.*)
++  	;;
+++ *-freebsd*)
+++ 	;;
++  *)
++  	echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6
++  echo "configure:6595: checking for gethostbyname_r in -lc_r" >&5
++*** misc/mozilla/configure.in	Tue May 28 04:29:12 2002
++--- misc/build/mozilla/configure.in	Sun Sep 10 11:56:18 2006
++***************
++*** 1606,1611 ****
++--- 1606,1613 ----
++  case $target in
++  *-hpux11.*)
++  	;;
+++ *-freebsd*)
+++ 	;;
++  *)
++  	AC_CHECK_LIB(c_r, gethostbyname_r)
++  	;;
++*** misc/mozilla/nsprpub/pr/src/misc/prnetdb.c	Wed Apr 10 12:17:35 2002
++--- misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c	Sun Sep 10 11:55:27 2006
++***************
++*** 105,111 ****
++  #define _PR_HAVE_GETPROTO_R_INT
++  #endif
++  
++! #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2)
++  #define _PR_HAVE_GETPROTO_R
++  #define _PR_HAVE_5_ARG_GETPROTO_R
++  #endif
++--- 105,112 ----
++  #define _PR_HAVE_GETPROTO_R_INT
++  #endif
++  
++! #if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) ||  \
++!     (defined(__FreeBSD__) && __FreeBSD_version > 601103)
++  #define _PR_HAVE_GETPROTO_R
++  #define _PR_HAVE_5_ARG_GETPROTO_R
++  #endif
diff --git a/editors/openoffice.org-1.0/files/patch-gethostbyname_r b/editors/openoffice.org-1.0/files/patch-gethostbyname_r
new file mode 100644
index 000000000000..1a04cdae0174
--- /dev/null
+++ b/editors/openoffice.org-1.0/files/patch-gethostbyname_r
@@ -0,0 +1,42 @@
+Index: sal/osl/unx/socket.c
+===================================================================
+RCS file: /cvs/porting/sal/osl/unx/socket.c,v
+retrieving revision 1.22.10.1
+diff -u -r1.22.10.1 socket.c
+--- sal/osl/unx/socket.c	18 Aug 2003 15:12:26 -0000	1.22.10.1
++++ sal/osl/unx/socket.c	10 Sep 2006 03:18:08 -0000
+@@ -836,7 +836,7 @@
+ 	const char *name, struct hostent *result,
+ 	char *buffer, int buflen, int *h_errnop)
+ {
+-#ifdef LINUX
++#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 601103))
+ 	struct hostent *__result; /* will be the same as result */
+ 	int __error;
+ 	__error = gethostbyname_r (name, result, buffer, buflen,
+Index: sal/osl/unx/system.c
+===================================================================
+RCS file: /cvs/porting/sal/osl/unx/system.c,v
+retrieving revision 1.8
+diff -u -r1.8 system.c
+--- sal/osl/unx/system.c	16 Jul 2003 17:21:47 -0000	1.8
++++ sal/osl/unx/system.c	10 Sep 2006 03:18:08 -0000
+@@ -371,6 +371,8 @@
+ 
+ extern int h_errno;
+ 
++#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
++
+ struct hostent *gethostbyname_r(const char *name, struct hostent *result,
+ 								char *buffer, int buflen, int *h_errnop)
+ {
+@@ -459,6 +461,8 @@
+ 
+   	return res;
+ }
++#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
++
+ 
+ #if defined(MACOSX)
+ /*
+ 
diff --git a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+system.h b/editors/openoffice.org-1.0/files/patch-sal+osl+unx+system.h
index a6ba577cda4b..f41646595af3 100644
--- a/editors/openoffice.org-1.0/files/patch-sal+osl+unx+system.h
+++ b/editors/openoffice.org-1.0/files/patch-sal+osl+unx+system.h
@@ -55,3 +55,17 @@
  struct hostent *gethostbyname_r(const char *name, struct hostent *result,
  								char *buffer, int buflen, int *h_errnop);
  #endif
+
+--- sal/osl/unx/system.h.orig	Fri Aug 15 20:38:50 2003
++++ sal/osl/unx/system.h	Sun Sep 10 13:32:43 2006
+@@ -576,8 +576,10 @@
+ struct tm *localtime_r(const time_t *timep, struct tm *buffer);
+ struct tm *gmtime_r(const time_t *timep, struct tm *buffer);
+ #endif /* !defined FREEBSD || (__FreeBSD_version < 500112) */
++#if !defined(FREEBSD) || (__FreeBSD_version < 601103)
+ struct hostent *gethostbyname_r(const char *name, struct hostent *result,
+ 								char *buffer, int buflen, int *h_errnop);
++#endif /* !defined(FREEBSD) || (__FreeBSD_version < 601103) */
+ #endif
+ 
+ #endif /* __OSL_SYSTEM_H__ */