Update to SRC680_m62. Builds with bison newer than 1.875a,

but doesn't work at the moment.

4 files changed, 70 insertions, 46 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index c7bb872e16bd..9ec79e48fd77 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -11,29 +11,29 @@ PORTREVISION=	1
 CATEGORIES+=	editors
 MASTER_SITES+=	${MASTER_SITE_LOCAL} \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
-		ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.7b/src/:moz \
+		${MASTER_SITE_MOZILLA:S,%SUBDIR%,mozilla/releases/mozilla1.7b/src/&,}:mozsrc \
 		http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/:help
-
 MASTER_SITE_SUBDIR=	maho/openoffice.org
 DISTFILES+=	OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2 gpc231.tar.Z:gpc
 EXTRACT_ONLY=	OOo_${BUILD_NR}${MILESTONE}_${SNAPDATE}_source.tar.bz2
 
 MAINTAINER=	openoffice@FreeBSD.org
+COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 
-BROKEN=		"Bison 1.875d is required, and setup fails"
+BROKEN=         "Bison 1.875a or newer is required, and doesn't work atm"
 
-SNAPDATE=	20041016
+SNAPDATE=	20041122
 NO_LATEST_LINK=	yes
 USE_GNOME=	gtk20
 MOZILLA_PROJECT=	cws_srx645_mozooo.20041016.tar.gz
 MOZILLA_SOURCE=		mozilla-source-1.7b-source.tar.gz
 .if !defined(WITHOUT_MOZILLA)
-DISTFILES+=	${MOZILLA_PROJECT} ${MOZILLA_SOURCE}:moz
+DISTFILES+=	${MOZILLA_PROJECT}:moz ${MOZILLA_SOURCE}:mozsrc
 USE_GNOME+=	orbit gtk12
 .endif
 
 USE_PERL5=	yes
-USE_BISON=	yes
+#USE_BISON=	yes #this bison should be later than bison1.875a
 USE_REINPLACE=	yes
 USE_BZIP2=	yes
 
@@ -48,7 +48,6 @@ JAVA_BUILD=	jdk
 
 LANG_PKGNAME?=	en-US
 LANG_EXT?=	01
-LANG_CONFIGURE_ARG?=	ENUS
 
 .if defined(L10NHELP)
 DISTFILES+=	${L10NHELP}:help
@@ -58,29 +57,30 @@ DISTFILES+=	helpcontent_49_unix.tgz:help
 L10NHELPS+=	helpcontent_49_unix.tgz
 .endif
 
-COMMENT?=	Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser(developer version)
 BUILD_NR=		680
-MILESTONE=		m56
+MILESTONE=		m62
 RELEASE_NR=		2.0
 DIST_SUBDIR=		openoffice2.0
 SIMPLEOSVER!=		${UNAME} -r | ${SED} -e 's/\.//' | ${SED} -e 's/\..*//'
-BUILD_DEPENDS+=	gcc32:${PORTSDIR}/lang/gcc32
+# gcc 3.3
+BUILD_DEPENDS+=	gcc33:${PORTSDIR}/lang/gcc33
 # FIXME
 .if defined(WITH_CCACHE)
 BUILD_DEPENDS+=	ccache:${PORTSDIR}/devel/ccache
-CC=	ccache gcc32
-CXX=	ccache g++32
+CC=	ccache gcc33
+CXX=	ccache g++33
 .else
-CC=	gcc32
-CXX=	g++32
+CC=	gcc33
+CXX=	g++33
 .endif
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		gcp:${PORTSDIR}/sysutils/coreutils \
+		epm:${PORTSDIR}/devel/epm \
 		gpatch:${PORTSDIR}/devel/patch \
 		${X11BASE}/lib/libXft.so:${PORTSDIR}/x11-fonts/libXft \
 		${SITE_PERL}/Archive/Zip.pm:${PORTSDIR}/archivers/p5-Archive-Zip \
-		bison1875:${PORTSDIR}/devel/bison1875
+		bison-devel:${PORTSDIR}/devel/bison-devel
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
@@ -119,7 +119,7 @@ CONFIGURE_ARGS+=	--disable-mozilla
 .if defined(ALL_LOCALIZED_LANGS)
 CONFIGURE_ARGS+=	--with-lang=ALL
 .else
-CONFIGURE_ARGS+=	--with-lang=${LANG_CONFIGURE_ARG}
+CONFIGURE_ARGS+=	--with-lang=${LANG_PKG_NAME}
 .endif
 
 .if defined(WITH_DEBUG)
@@ -161,8 +161,8 @@ post-extract:
 	@${ECHO_MSG} "===>  Extracting All available L10NHELPs"
 	@${MKDIR} ${WRKDIR}/L10NHELP
 	@cd ${WRKDIR}/L10NHELP ; \
-	for file in ${L10NHELPS}; do \
-		${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$file | ${GZIP_CMD} -d | ${TAR} xf - ; \
+	for helpfile in ${L10NHELPS}; do \
+		${CAT} ${DISTDIR}/${DIST_SUBDIR}/$$helpfile | ${GZIP_CMD} -d | ${TAR} xf - ; \
 	done
 .endif
 .if !defined(WITHOUT_MOZILLA)
@@ -183,7 +183,7 @@ do-build:
 	@${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/solver/${BUILD_NR}/unxfbsd.pro/pck
 .endif
 .if !defined(WITHOUT_MOZILLA)
-	cd ${WRKSRC}/moz.runtime ; ${SETENV} "BUILD_MOZAB=TRUE" ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; dmake zip' ; cp unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped
+	cd ${WRKSRC}/moz.runtime ; ${SETENV} "BUILD_MOZAB=TRUE" ${TCSH} -c 'source ../FreeBSDEnv.Set ; build.pl ; dmake zip' ; ${CP} unxfbsd.pro/zipped/FREEBSD*.zip ../moz/zipped
 .endif
 	@cd ${WRKSRC} ;	${TCSH} -c 'source FreeBSDEnv.Set ; dmake'
 
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index ff654921caa3..38b37288d1bc 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,10 +1,8 @@
-MD5 (openoffice2.0/OOo_680m56_20041016_source.tar.bz2) = 847bc0123517340af30899fbea068118
-SIZE (openoffice2.0/OOo_680m56_20041016_source.tar.bz2) = 211136183
+MD5 (openoffice2.0/OOo_680m62_20041122_source.tar.bz2) = c51fe8320646c30007bdd7c36a2dedd8
+SIZE (openoffice2.0/OOo_680m62_20041122_source.tar.bz2) = 215723858
 MD5 (openoffice2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
 SIZE (openoffice2.0/gpc231.tar.Z) = 27917
 MD5 (openoffice2.0/cws_srx645_mozooo.20041016.tar.gz) = eda0ab73b24c45890ae08bdfe04049bd
 SIZE (openoffice2.0/cws_srx645_mozooo.20041016.tar.gz) = 75793
 MD5 (openoffice2.0/mozilla-source-1.7b-source.tar.gz) = 23ffd553d570869cf30b301f2564d2da
 SIZE (openoffice2.0/mozilla-source-1.7b-source.tar.gz) = 40747410
-MD5 (openoffice2.0/helpcontent_49_unix.tgz) = a39f44ec40f452c963a4a187f31d1acb
-SIZE (openoffice2.0/helpcontent_49_unix.tgz) = 13649920
diff --git a/editors/openoffice-3-devel/files/moz-patch b/editors/openoffice-3-devel/files/moz-patch
index 78ba7eb8946d..eb06154b2d97 100644
--- a/editors/openoffice-3-devel/files/moz-patch
+++ b/editors/openoffice-3-devel/files/moz-patch
@@ -6,7 +6,7 @@ http://qa.openoffice.org/issues/show_bug.cgi?id=11424
 
 diff -u moz/mozilla-source-1.7b.patch moz.new/mozilla-source-1.7b.patch
 --- moz/mozilla-source-1.7b.patch	Wed Jul 14 13:22:36 2004
-+++ moz.new/mozilla-source-1.7b.patch	Fri Oct 22 22:44:42 2004
++++ moz.new/mozilla-source-1.7b.patch	Mon Nov 22 18:22:38 2004
 @@ -4447,7 +4447,6 @@
  +#MKSHLIB += -R '$$ORIGIN'
   endif
@@ -15,7 +15,7 @@ diff -u moz/mozilla-source-1.7b.patch moz.new/mozilla-source-1.7b.patch
  
  Index: mailnews/addrbook/src/nsAbMD5sum.cpp
  ===================================================================
-@@ -5104,3 +5103,64 @@
+@@ -5104,3 +5103,81 @@
  +//#define HAVE_MMX_INTEL_MNEMONICS 
  +//#define HAVE_SSE2_INTEL_MNEMONICS 
   #endif
@@ -80,3 +80,21 @@ diff -u moz/mozilla-source-1.7b.patch moz.new/mozilla-source-1.7b.patch
 + ifeq ($(OS_ARCH), NetBSD)
 + EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
 + endif
++
++
++--- misc/build/mozilla/extensions/negotiateauth/nsHttpGssapiAuth.cpp.org	Tue Mar 16 09:34:01 2004
+++++ misc/build/mozilla/extensions/negotiateauth/nsHttpGssapiAuth.cpp	Mon Nov 22 18:21:07 2004
++@@ -289,7 +289,7 @@
++     return NS_OK;
++ }
++ 
++-NS_IMPL_ISUPPORTS1(nsHttpGssapiAuth, nsIHttpAuthenticator);
+++NS_IMPL_ISUPPORTS1(nsHttpGssapiAuth, nsIHttpAuthenticator)
++    
++ //
++ // GenerateCredentials
++
++
++
++
++
diff --git a/editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk
index 52364e091e20..16c987a9c521 100644
--- a/editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk
+++ b/editors/openoffice-3-devel/files/patch-solenv+inc+unxfbsdi.mk
@@ -1,19 +1,18 @@
-#iz XXXXX
-New unxfbsdi.mk, catching up linux's one.
-
 Index: solenv/inc/unxfbsdi.mk
 ===================================================================
 RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v
 retrieving revision 1.11
 diff -u -r1.11 unxfbsdi.mk
 --- solenv/inc/unxfbsdi.mk	20 Sep 2004 08:37:13 -0000	1.11
-+++ solenv/inc/unxfbsdi.mk	3 Oct 2004 06:45:36 -0000
-@@ -61,15 +61,21 @@
++++ solenv/inc/unxfbsdi.mk	21 Nov 2004 14:26:32 -0000
+@@ -60,16 +60,26 @@
+ #
  #*************************************************************************
  
- # mak file for unxfbsdi
+-# mak file for unxfbsdi
 -ASM=$(CC)
 -AFLAGS=-x assembler-with-cpp -c $(CDEFS)
++# mk file for unxfbsdi
 +ASM=
 +AFLAGS=
 +
@@ -24,16 +23,20 @@ diff -u -r1.11 unxfbsdi.mk
  #not needed at the moment
  #LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter"
  
-+# options for C and C++ Compiler
-+CDEFS+=	-D_USE_NAMESPACE=1 -DX86 -DNEW_SOLAR -DSTLPORT_VERSION=450 -DOSVERSION=$(OSVERSION)
-+CDEFS+= $(PTHREAD_CFLAGS) -D_REENTRANT
++# _PTHREADS is needed for the stl
++CDEFS+= -DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
++
++# enable visibility define in "sal/types.h"
++.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
++CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE
++.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
 +
  # this is a platform with JAVA support
 -SOLAR_JAVA*=TRUE
  .IF "$(SOLAR_JAVA)"!=""
  JAVADEF=-DSOLAR_JAVA
  .IF "$(debug)"==""
-@@ -77,121 +83,101 @@
+@@ -77,96 +87,82 @@
  .ELSE
  JAVA_RUNTIME=-ljava_g
  .ENDIF
@@ -78,10 +81,7 @@ diff -u -r1.11 unxfbsdi.mk
  # Flags for enabling exception handling
 -CFLAGSEXCEPTIONS= -fexceptions
 -CFLAGS_NO_EXCEPTIONS= -fno-exceptions
-+CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
-+# Flags for disabling exception handling
-+CFLAGS_NO_EXCEPTIONS=-fno-exceptions
- 
+-
 -# Compiler flags for compiling static object in single threaded
 -# environment with graphical user interface
 -CFLAGSOBJGUIST= -fPIC
@@ -105,7 +105,10 @@ diff -u -r1.11 unxfbsdi.mk
 -# Compiler flags for compiling shared object in multi threaded
 -# environment with character user interface
 -CFLAGSSLOCUIMT=	-fPIC
--
++CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs
++# Flags for disabling exception handling
++CFLAGS_NO_EXCEPTIONS=-fno-exceptions
+ 
 -# Compiler flags for profilin
 -CFLAGSPROF=     -pg
 +CFLAGSCXX= -pipe $(ARCH_FLAGS)
@@ -182,10 +185,7 @@ diff -u -r1.11 unxfbsdi.mk
  
  # linker flags for linking shared libraries
  LINKFLAGSSHLGUI= -shared
- LINKFLAGSSHLCUI= -shared
--
- LINKFLAGSTACK=
- LINKFLAGSPROF=
+@@ -177,23 +173,19 @@
  LINKFLAGSDEBUG=-g
  LINKFLAGSOPT=
  
@@ -212,8 +212,11 @@ diff -u -r1.11 unxfbsdi.mk
 +STDLIBCPP=-lstdc++
  
  # default objectfilenames to link
++STDOBJVCL=$(L)$/salmain.o
  STDOBJGUI=
-@@ -201,24 +187,30 @@
+ STDSLOGUI=
+ STDOBJCUI=
+@@ -201,24 +193,30 @@
  
  # libraries for linking applications
  STDLIBCUIST=-lm
@@ -228,7 +231,7 @@ diff -u -r1.11 unxfbsdi.mk
 +STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm
  STDSHLCUIMT=$(PTHREAD_LIBS) -lm
 +STDSHLGUIST=-lX11 -lXext -lm
-+STDSHLCUIST=-ldl
++STDSHLCUIST=-lm
  
  LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
  
@@ -252,3 +255,8 @@ diff -u -r1.11 unxfbsdi.mk
  
  # tool for generating import libraries
  IMPLIB=
+@@ -237,3 +235,4 @@
+ DLLPOSTFIX=fi
+ DLLPRE=lib
+ DLLPOST=.so
++