aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2000-10-16 19:23:34 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2000-10-16 19:23:34 +0000
commit25725d6ffb1985a613de587177d86d99174f5762 (patch)
treea3f27732320c18065482eb105686abef1e7019df
parent79ce0388ddb517394112fb1d91efae5365e9c907 (diff)
downloadports-25725d6ffb1985a613de587177d86d99174f5762.tar.gz
ports-25725d6ffb1985a613de587177d86d99174f5762.zip
Notes
-rw-r--r--editors/openoffice-1.0/Makefile88
-rw-r--r--editors/openoffice-1.0/distinfo3
-rw-r--r--editors/openoffice-1.0/files/patch-bootstrap.111
-rw-r--r--editors/openoffice-1.0/files/patch-config_office+set_soenv.1218
-rw-r--r--editors/openoffice-1.0/files/patch-configure11
-rw-r--r--editors/openoffice-1.0/files/patch-set_soenv.1218
-rw-r--r--editors/openoffice-1.1-devel/Makefile88
-rw-r--r--editors/openoffice-1.1-devel/distinfo3
-rw-r--r--editors/openoffice-1.1-devel/files/patch-bootstrap.111
-rw-r--r--editors/openoffice-1.1-devel/files/patch-configure11
-rw-r--r--editors/openoffice-1.1-devel/files/patch-set_soenv.1218
-rw-r--r--editors/openoffice-1.1/Makefile88
-rw-r--r--editors/openoffice-1.1/distinfo3
-rw-r--r--editors/openoffice-1.1/files/patch-bootstrap.111
-rw-r--r--editors/openoffice-1.1/files/patch-configure11
-rw-r--r--editors/openoffice-1.1/files/patch-set_soenv.1218
-rw-r--r--editors/openoffice-2.0-devel/Makefile88
-rw-r--r--editors/openoffice-2.0-devel/distinfo3
-rw-r--r--editors/openoffice-2.0-devel/files/patch-bootstrap.111
-rw-r--r--editors/openoffice-2.0-devel/files/patch-configure11
-rw-r--r--editors/openoffice-2.0-devel/files/patch-set_soenv.1218
-rw-r--r--editors/openoffice-3-devel/Makefile88
-rw-r--r--editors/openoffice-3-devel/distinfo3
-rw-r--r--editors/openoffice-3-devel/files/patch-bootstrap.111
-rw-r--r--editors/openoffice-3-devel/files/patch-configure11
-rw-r--r--editors/openoffice-3-devel/files/patch-set_soenv.1218
-rw-r--r--editors/openoffice-3/Makefile88
-rw-r--r--editors/openoffice-3/distinfo3
-rw-r--r--editors/openoffice-3/files/patch-bootstrap.111
-rw-r--r--editors/openoffice-3/files/patch-configure11
-rw-r--r--editors/openoffice-3/files/patch-set_soenv.1218
-rw-r--r--editors/openoffice-devel/Makefile88
-rw-r--r--editors/openoffice-devel/distinfo3
-rw-r--r--editors/openoffice-devel/files/patch-bootstrap.111
-rw-r--r--editors/openoffice-devel/files/patch-configure11
-rw-r--r--editors/openoffice-devel/files/patch-set_soenv.1218
-rw-r--r--editors/openoffice.org-1.0/Makefile88
-rw-r--r--editors/openoffice.org-1.0/distinfo3
-rw-r--r--editors/openoffice.org-1.0/files/patch-bootstrap.111
-rw-r--r--editors/openoffice.org-1.0/files/patch-config_office+set_soenv.1218
-rw-r--r--editors/openoffice.org-1.0/files/patch-configure11
-rw-r--r--editors/openoffice.org-1.0/files/patch-set_soenv.1218
-rw-r--r--editors/openoffice.org-1.1-devel/Makefile88
-rw-r--r--editors/openoffice.org-1.1-devel/distinfo3
-rw-r--r--editors/openoffice.org-1.1-devel/files/patch-bootstrap.111
-rw-r--r--editors/openoffice.org-1.1-devel/files/patch-configure11
-rw-r--r--editors/openoffice.org-1.1-devel/files/patch-set_soenv.1218
-rw-r--r--editors/openoffice.org-1.1/Makefile88
-rw-r--r--editors/openoffice.org-1.1/distinfo3
-rw-r--r--editors/openoffice.org-1.1/files/patch-bootstrap.111
-rw-r--r--editors/openoffice.org-1.1/files/patch-configure11
-rw-r--r--editors/openoffice.org-1.1/files/patch-set_soenv.1218
-rw-r--r--editors/openoffice.org-2-RC/Makefile88
-rw-r--r--editors/openoffice.org-2-RC/distinfo3
-rw-r--r--editors/openoffice.org-2-RC/files/patch-bootstrap.111
-rw-r--r--editors/openoffice.org-2-RC/files/patch-configure11
-rw-r--r--editors/openoffice.org-2-RC/files/patch-set_soenv.1218
-rw-r--r--editors/openoffice.org-2-devel/Makefile88
-rw-r--r--editors/openoffice.org-2-devel/distinfo3
-rw-r--r--editors/openoffice.org-2-devel/files/patch-bootstrap.111
-rw-r--r--editors/openoffice.org-2-devel/files/patch-configure11
-rw-r--r--editors/openoffice.org-2-devel/files/patch-set_soenv.1218
-rw-r--r--editors/openoffice.org-2.0-devel/Makefile88
-rw-r--r--editors/openoffice.org-2.0-devel/distinfo3
-rw-r--r--editors/openoffice.org-2.0-devel/files/patch-bootstrap.111
-rw-r--r--editors/openoffice.org-2.0-devel/files/patch-configure11
-rw-r--r--editors/openoffice.org-2.0-devel/files/patch-set_soenv.1218
-rw-r--r--editors/openoffice.org-2.0/Makefile88
-rw-r--r--editors/openoffice.org-2.0/distinfo3
-rw-r--r--editors/openoffice.org-2.0/files/patch-bootstrap.111
-rw-r--r--editors/openoffice.org-2.0/files/patch-configure11
-rw-r--r--editors/openoffice.org-2.0/files/patch-set_soenv.1218
-rw-r--r--editors/openoffice.org-2/Makefile88
-rw-r--r--editors/openoffice.org-2/distinfo3
-rw-r--r--editors/openoffice.org-2/files/patch-bootstrap.111
-rw-r--r--editors/openoffice.org-2/files/patch-configure11
-rw-r--r--editors/openoffice.org-2/files/patch-set_soenv.1218
-rw-r--r--editors/openoffice.org-3-RC/Makefile88
-rw-r--r--editors/openoffice.org-3-RC/distinfo3
-rw-r--r--editors/openoffice.org-3-RC/files/patch-bootstrap.111
-rw-r--r--editors/openoffice.org-3-RC/files/patch-configure11
-rw-r--r--editors/openoffice.org-3-RC/files/patch-set_soenv.1218
-rw-r--r--editors/openoffice.org-3-devel/Makefile88
-rw-r--r--editors/openoffice.org-3-devel/distinfo3
-rw-r--r--editors/openoffice.org-3-devel/files/patch-bootstrap.111
-rw-r--r--editors/openoffice.org-3-devel/files/patch-configure11
-rw-r--r--editors/openoffice.org-3-devel/files/patch-set_soenv.1218
-rw-r--r--editors/openoffice.org-3/Makefile88
-rw-r--r--editors/openoffice.org-3/distinfo3
-rw-r--r--editors/openoffice.org-3/files/patch-bootstrap.111
-rw-r--r--editors/openoffice.org-3/files/patch-configure11
-rw-r--r--editors/openoffice.org-3/files/patch-set_soenv.1218
-rw-r--r--editors/openoffice.org-vcltesttool/Makefile88
-rw-r--r--editors/openoffice.org-vcltesttool/distinfo3
-rw-r--r--editors/openoffice.org-vcltesttool/files/patch-bootstrap.111
-rw-r--r--editors/openoffice.org-vcltesttool/files/patch-configure11
-rw-r--r--editors/openoffice.org-vcltesttool/files/patch-set_soenv.1218
-rw-r--r--editors/openoffice/Makefile88
-rw-r--r--editors/openoffice/distinfo3
-rw-r--r--editors/openoffice/files/patch-bootstrap.111
-rw-r--r--editors/openoffice/files/patch-config_office+set_soenv.1218
-rw-r--r--editors/openoffice/files/patch-configure11
-rw-r--r--editors/openoffice/files/patch-set_soenv.1218
103 files changed, 5634 insertions, 1640 deletions
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile
index d510844e3a06..664b4dc13769 100644
--- a/editors/openoffice-1.0/Makefile
+++ b/editors/openoffice-1.0/Makefile
@@ -1,3 +1,4 @@
+# ex:ts=8
# New ports collection makefile for: StarOffice 5.2
# Date created: 22 August 2000
# Whom: Martin Blapp
@@ -5,91 +6,18 @@
# $FreeBSD$
#
-PORTNAME= staroffice
-PORTVERSION= 5.2
-CATEGORIES= editors linux
-MASTER_SITES= ftp://ftp.inf.utfsm.cl/pub/UTFSM/StarOffice_5.2/ \
- ftp://ftp.snerpa.is/pub/linux/ \
- ftp://ftp.osb.hu/pub/mirrors/staroffice/linux/ \
- ftp://ftp.uni-linz.ac.at/pub/staroffice_5.2/ \
- ftp://ftp.labyrinth.net.au/.5/kk/linux/star_office/ \
- ftp://ftp.acs.oakland.edu/files/Linux/StarOffice/office52/ \
- ftp://ftp.ctio.noao.edu/linux/ \
- ftp://sunsite.cnlab-switch.ch/mirror/staroffice/english/ \
- ftp://ftp.linux.tucows.com/pub/Linuxberg/ \
- ftp://ftp.jcu.edu.au/pub/StarOffice/ \
- ftp://ftp.uakom.sk/pub/mirrors/StarOffice/ \
- ftp://ftp.linux.hr/pub/staroffice/5.2/
-DISTNAME= so-5_2-ga-bin-linux-en.bin
-DISTFILES= soa-5_2-ga-bin-linux-en.bin so-5_2-ga-bin-linux-en.bin
-EXTRACT_ONLY=
+PORTNAME= openoffice
+PORTVERSION= 6.0.a605
+CATEGORIES= editors
+MASTER_SITES= http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
+DISTNAME= oo_605_src
-MAINTAINER= mb@imp.ch
+MAINTAINER= obrien@FreeBSD.org
-FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-
-ONLY_FOR_ARCHS= i386
-NO_CDROM= 'Must be downloaded direct from Sun via www interface'
-IS_INTERACTIVE= yes
-NO_BUILD= yes
-DIST_SUBDIR= staroffice52
-WRKSRC= ${WRKDIR}/office52
-TMPDIR= ${WRKDIR}/tmp
-LD_PATH= ${TMPDIR}:${WRKSRC}:${LINUXBASE}/lib:${LINUXBASE}/usr/lib
+CONFIGURE_WRKSRC= ${WRKSRC}/config_office
.include <bsd.port.pre.mk>
-pre-fetch:
-.if ${OSVERSION} < 410000
- @${ECHO}
- @${ECHO} OS-VERSION ${OSVERSION}
- @${ECHO}
- @${ECHO} Staroffice depends on a scripting fix for
- @${ECHO} /usr/src/sys/i386/linux/linux_sysvec.c
- @${ECHO} \(revision 1.55.2.1 or higher\)
- @${ECHO}
- @${ECHO} Please upgrade to FreeBSD 4.1
- @${ECHO}
- @${FALSE}
-.endif
-.if defined(WITH_CDROM)
-.if !exists(${CD_MOUNTPT}/linux/office52/setup)
- @${ECHO}
- @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
- @${ECHO} onto /cdrom and run make again.
- @${ECHO}
- @${FALSE}
-.endif
-.endif
-
-.if defined(WITH_CDROM)
-do-extract:
- @${MKDIR} ${WRKSRC}/office52
- @cd ${WRKSRC}/office52 && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
-.endif
-
-do-extract:
-.if !defined(DISPLAY) || ${DISPLAY} == ""
- @ ${ECHO}
- @ ${ECHO} Can\'t open display:
- @ ${ECHO} Please check your DISPLAY variable.
- @ ${ECHO}
- @ ${FALSE}
-.else
- @${MKDIR} ${WRKSRC}
- @${MKDIR} ${TMPDIR}
- @${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC}
- @${CP} ${_DISTDIR}/soa-5_2-ga-bin-linux-en.bin ${WRKSRC}
- @${CHMOD} 755 ${WRKSRC}/${DISTNAME}
- @${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
- @cd ${WRKSRC}
- @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
- @cd ../../
-.endif
-
-post-configure:
- @${PERL} -pi.orig -e 's|DefaultDestPath = "office52";|DefaultDestPath = "${PREFIX}/office52";|' ${WRKSRC}/setup.ins
-
do-install:
.if !defined(DISPLAY) || ${DISPLAY} == ""
@ ${ECHO}
diff --git a/editors/openoffice-1.0/distinfo b/editors/openoffice-1.0/distinfo
index f1e7894f7587..bc002ffc38b1 100644
--- a/editors/openoffice-1.0/distinfo
+++ b/editors/openoffice-1.0/distinfo
@@ -1,2 +1 @@
-MD5 (staroffice52/soa-5_2-ga-bin-linux-en.bin) = 8f36a55d7cefd919febdefb502ae986d
-MD5 (staroffice52/so-5_2-ga-bin-linux-en.bin) = 1f03de10b6127772ba87567d334aeb4d
+MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
diff --git a/editors/openoffice-1.0/files/patch-bootstrap.1 b/editors/openoffice-1.0/files/patch-bootstrap.1
new file mode 100644
index 000000000000..fc625e321cca
--- /dev/null
+++ b/editors/openoffice-1.0/files/patch-bootstrap.1
@@ -0,0 +1,11 @@
+--- config_office/bootstrap.1.orig Mon Sep 18 09:13:24 2000
++++ config_office/bootstrap.1 Fri Oct 13 17:51:37 2000
+@@ -9,6 +9,8 @@
+ make linux
+ else if ($platform == "Darwin") then
+ make macosx
++else if ($platform == "FreeBSD") then
++ make linux
+ endif
+
+ if "$?" != "0" exit
diff --git a/editors/openoffice-1.0/files/patch-config_office+set_soenv.1 b/editors/openoffice-1.0/files/patch-config_office+set_soenv.1
new file mode 100644
index 000000000000..d18d3038c06b
--- /dev/null
+++ b/editors/openoffice-1.0/files/patch-config_office+set_soenv.1
@@ -0,0 +1,218 @@
+--- config_office/set_soenv.1.orig Thu Oct 12 10:16:28 2000
++++ config_office/set_soenv.1 Sun Oct 15 23:12:53 2000
+@@ -11,7 +11,7 @@
+ # Description:
+ # set_soenv generates a file that contains all necessary
+ # environment variables for the build proces of OpenOffice
+-# on Linux, Solaris, Windows NT and Macosx.
++# on Linux, Solaris, FreeBSD, Windows NT and Macosx.
+ # This script prompts the installer to enter:
+ # 1. (if necessary) The directory where the jdk is located (JAVA_HOME).
+ # 2. (if necessary) The directory where the Microsoft C/C++ compiler is located (COMPATH).
+@@ -53,7 +53,7 @@
+ #--------------------------------------------------------
+ #
+ my ( $outfile, $bootfile, $newline, $comment, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,
+- $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $Winnt, $Macosx, $WScomp,
++ $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Freebsd, $Linux, $Winnt, $Macosx, $WScomp,
+ $GNUcomp, $platform, $machine_type, $empty, $no_jdk, $no_tcsh, $no_cl, $no_gcc, $no_gcc_home, $no_gcc_include,
+ $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $win_format_var);
+ #
+@@ -121,6 +121,7 @@
+ $L = " -L"; # library search path
+ $D = " -D"; # define search path
+ $Solaris = "SunOS"; # return of uname command on Solaris
++$Freebsd = "FreeBSD"; # return of uname command on FreeBSD
+ $Linux = "Linux"; # return of uname command on Linux
+ $Winnt = "WINNT"; # return of uname command on Windows NT
+ $Macosx = "Darwin"; # return of uname command on Macosx
+@@ -162,8 +163,8 @@
+ #
+ $platform = `uname`; # probing the platform
+ chomp( $platform );
+-if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) )
+-{ die "This script is only suitable for the Solaris, Linux, Windows NT or Macosx platform!\n";
++if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) ) && ( $platform ne $Freebsd )
++{ die "This script is only suitable for the Solaris, FreeBSD, Linux, Windows NT or Macosx platform!\n";
+ }
+ else
+ { if ( $platform eq $Solaris )
+@@ -254,6 +255,54 @@
+ $PROSWITCH = "-DPRODUCT";
+ $XPVERSION = "3";
+ }
++elsif ( $platform eq "$Freebsd" )
++{ if ($machine_type eq "i686")
++ { print "Setting FreeBSD Intel specific values... ";
++ $outfile = "LinuxIntelEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "I";
++ $CPUNAME = "INTEL";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngi3";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ else
++ { if ($machine_type eq "alpha")
++ { print "Setting FreeBSD/Alpha specific values... ";
++ $outfile = "FreeBSDAlphaEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "S";
++ $CPUNAME = "ALPHA";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngs";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ }
++}
+ elsif ( $platform eq "$Linux" )
+ { if ($machine_type eq "i686")
+ { print "Setting Linux Intel specific values... ";
+@@ -430,7 +479,7 @@
+ }
+ # 4. Gcc path.
+ # Check whether autoconf found the compiler path.
+-if ($platform eq $Linux)
++if ($platform eq $Linux) -o ($platform eq $Freebsd)
+ { if ( $ARGV[ 0 ] eq $no_gcc)
+ { AddWarning( "set_soenv", "Autoconf did not find correct gcc compiler, prompted for value" );
+ printf "Did you build gcc 2.95.2 from source using the --prefix and --enable-shared flags (y/n)?: ";
+@@ -643,6 +692,13 @@
+ $ps.$par_dir.$LIB.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $LD_LIBRARY_PATH = $cur_dir.
++ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
++ $ps.$USR_LOCAL.$LIB.
++ $ps.$par_dir.$LIB.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $LD_LIBRARY_PATH = $cur_dir.
+ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
+@@ -681,6 +737,21 @@
+ $D."PRODUCT".
+ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARDEF = '"'.$D."UNX".
++ $D.$COM.
++ $D.$CVER.
++ $D.$GVER.
++ $D."_PTHREADS".
++ $D.$OS.
++ $D.$CPUNAME.
++ $D."X86".
++ $D."_REENTRANT".
++ $D."_POSIX_PTHREAD_SEMANTICS".
++ $D."SUPD=$UPD".
++ $D."PRODUCT".
++ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARDEF = '"'.$D."UNX".
+ $D.$COM.
+@@ -707,6 +778,12 @@
+ $L.$USR_DT.$LIB.
+ $L.$USR_OPENWIN.$LIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
++ $L.$LIB.
++ $L.$USR.$LIB.
++ $L.$USR.$LOCAL.$LIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
+ $L.$LIB.
+@@ -721,6 +798,9 @@
+ if ($platform eq "$Solaris")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
+@@ -790,6 +870,20 @@
+ $ps.$USR_DT.$BIN.
+ $ps.$USR.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $PATH = $cur_dir.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
++ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
++ $ps.'$SOLARENV'.$BIN.
++ $ps.'$JAVA_HOME'.$BIN;
++
++ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
++
++ $PATH .= $ps.$USR.$ds."sbin".
++ $ps.$ETC.
++ $ps.$USR.$BIN.$ds."X11".
++ $ps.$USR.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $PATH = $cur_dir.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
+@@ -861,6 +955,17 @@
+ $L.'$JAVA_HOME'.$LIB.
+ $L.$XLIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARLIB = '"'.$L.$par_dir.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.$LIB.
++ $L.$USR_LIB.
++ $L.$USR_LOCAL.$LIB.
++ $L.'$JAVA_HOME'.$LIB.
++ $L.$XLIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARLIB = '"'.$L.$par_dir.$LIB.
+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+@@ -898,6 +1003,16 @@
+ $I.'$JAVA_HOME'.$INCLUDE.
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."solaris".
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".'"';
++}
++elsif ($platform eq "$Freebsd")
++{ $SOLARINC .= $I.$GXX_INCLUDE.
++ $I.'$SOLARENV'.$INC.$ds."Xp31".
++ $I.'$JAVA_HOME'.$INCLUDE.
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."linux".
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".
++ $I.$XINC.
++ $I.$GCC_INCLUDE.
++ $I.$USR.$INCLUDE.'"';
+ }
+ elsif ($platform eq "$Linux")
+ { $SOLARINC .= $I.$GXX_INCLUDE.
diff --git a/editors/openoffice-1.0/files/patch-configure b/editors/openoffice-1.0/files/patch-configure
new file mode 100644
index 000000000000..744225fe9d31
--- /dev/null
+++ b/editors/openoffice-1.0/files/patch-configure
@@ -0,0 +1,11 @@
+--- config_office/configure.orig Thu Oct 12 02:34:03 2000
++++ config_office/configure Fri Oct 13 17:52:25 2000
+@@ -739,7 +739,7 @@
+ echo $ac_n "checking the operating system""... $ac_c" 1>&6
+ echo "configure:741: checking the operating system" >&5
+ _os=`uname`
+-if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin"; then
++if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin" -o "$_os" = "FreeBSD"; then
+ echo "$ac_t""checked ($_os)" 1>&6
+ else
+ { echo "configure: error: $_os operating system is not suitable to build OpenOffice!" 1>&2; exit 1; }
diff --git a/editors/openoffice-1.0/files/patch-set_soenv.1 b/editors/openoffice-1.0/files/patch-set_soenv.1
new file mode 100644
index 000000000000..d18d3038c06b
--- /dev/null
+++ b/editors/openoffice-1.0/files/patch-set_soenv.1
@@ -0,0 +1,218 @@
+--- config_office/set_soenv.1.orig Thu Oct 12 10:16:28 2000
++++ config_office/set_soenv.1 Sun Oct 15 23:12:53 2000
+@@ -11,7 +11,7 @@
+ # Description:
+ # set_soenv generates a file that contains all necessary
+ # environment variables for the build proces of OpenOffice
+-# on Linux, Solaris, Windows NT and Macosx.
++# on Linux, Solaris, FreeBSD, Windows NT and Macosx.
+ # This script prompts the installer to enter:
+ # 1. (if necessary) The directory where the jdk is located (JAVA_HOME).
+ # 2. (if necessary) The directory where the Microsoft C/C++ compiler is located (COMPATH).
+@@ -53,7 +53,7 @@
+ #--------------------------------------------------------
+ #
+ my ( $outfile, $bootfile, $newline, $comment, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,
+- $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $Winnt, $Macosx, $WScomp,
++ $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Freebsd, $Linux, $Winnt, $Macosx, $WScomp,
+ $GNUcomp, $platform, $machine_type, $empty, $no_jdk, $no_tcsh, $no_cl, $no_gcc, $no_gcc_home, $no_gcc_include,
+ $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $win_format_var);
+ #
+@@ -121,6 +121,7 @@
+ $L = " -L"; # library search path
+ $D = " -D"; # define search path
+ $Solaris = "SunOS"; # return of uname command on Solaris
++$Freebsd = "FreeBSD"; # return of uname command on FreeBSD
+ $Linux = "Linux"; # return of uname command on Linux
+ $Winnt = "WINNT"; # return of uname command on Windows NT
+ $Macosx = "Darwin"; # return of uname command on Macosx
+@@ -162,8 +163,8 @@
+ #
+ $platform = `uname`; # probing the platform
+ chomp( $platform );
+-if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) )
+-{ die "This script is only suitable for the Solaris, Linux, Windows NT or Macosx platform!\n";
++if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) ) && ( $platform ne $Freebsd )
++{ die "This script is only suitable for the Solaris, FreeBSD, Linux, Windows NT or Macosx platform!\n";
+ }
+ else
+ { if ( $platform eq $Solaris )
+@@ -254,6 +255,54 @@
+ $PROSWITCH = "-DPRODUCT";
+ $XPVERSION = "3";
+ }
++elsif ( $platform eq "$Freebsd" )
++{ if ($machine_type eq "i686")
++ { print "Setting FreeBSD Intel specific values... ";
++ $outfile = "LinuxIntelEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "I";
++ $CPUNAME = "INTEL";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngi3";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ else
++ { if ($machine_type eq "alpha")
++ { print "Setting FreeBSD/Alpha specific values... ";
++ $outfile = "FreeBSDAlphaEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "S";
++ $CPUNAME = "ALPHA";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngs";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ }
++}
+ elsif ( $platform eq "$Linux" )
+ { if ($machine_type eq "i686")
+ { print "Setting Linux Intel specific values... ";
+@@ -430,7 +479,7 @@
+ }
+ # 4. Gcc path.
+ # Check whether autoconf found the compiler path.
+-if ($platform eq $Linux)
++if ($platform eq $Linux) -o ($platform eq $Freebsd)
+ { if ( $ARGV[ 0 ] eq $no_gcc)
+ { AddWarning( "set_soenv", "Autoconf did not find correct gcc compiler, prompted for value" );
+ printf "Did you build gcc 2.95.2 from source using the --prefix and --enable-shared flags (y/n)?: ";
+@@ -643,6 +692,13 @@
+ $ps.$par_dir.$LIB.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $LD_LIBRARY_PATH = $cur_dir.
++ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
++ $ps.$USR_LOCAL.$LIB.
++ $ps.$par_dir.$LIB.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $LD_LIBRARY_PATH = $cur_dir.
+ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
+@@ -681,6 +737,21 @@
+ $D."PRODUCT".
+ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARDEF = '"'.$D."UNX".
++ $D.$COM.
++ $D.$CVER.
++ $D.$GVER.
++ $D."_PTHREADS".
++ $D.$OS.
++ $D.$CPUNAME.
++ $D."X86".
++ $D."_REENTRANT".
++ $D."_POSIX_PTHREAD_SEMANTICS".
++ $D."SUPD=$UPD".
++ $D."PRODUCT".
++ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARDEF = '"'.$D."UNX".
+ $D.$COM.
+@@ -707,6 +778,12 @@
+ $L.$USR_DT.$LIB.
+ $L.$USR_OPENWIN.$LIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
++ $L.$LIB.
++ $L.$USR.$LIB.
++ $L.$USR.$LOCAL.$LIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
+ $L.$LIB.
+@@ -721,6 +798,9 @@
+ if ($platform eq "$Solaris")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
+@@ -790,6 +870,20 @@
+ $ps.$USR_DT.$BIN.
+ $ps.$USR.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $PATH = $cur_dir.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
++ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
++ $ps.'$SOLARENV'.$BIN.
++ $ps.'$JAVA_HOME'.$BIN;
++
++ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
++
++ $PATH .= $ps.$USR.$ds."sbin".
++ $ps.$ETC.
++ $ps.$USR.$BIN.$ds."X11".
++ $ps.$USR.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $PATH = $cur_dir.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
+@@ -861,6 +955,17 @@
+ $L.'$JAVA_HOME'.$LIB.
+ $L.$XLIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARLIB = '"'.$L.$par_dir.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.$LIB.
++ $L.$USR_LIB.
++ $L.$USR_LOCAL.$LIB.
++ $L.'$JAVA_HOME'.$LIB.
++ $L.$XLIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARLIB = '"'.$L.$par_dir.$LIB.
+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+@@ -898,6 +1003,16 @@
+ $I.'$JAVA_HOME'.$INCLUDE.
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."solaris".
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".'"';
++}
++elsif ($platform eq "$Freebsd")
++{ $SOLARINC .= $I.$GXX_INCLUDE.
++ $I.'$SOLARENV'.$INC.$ds."Xp31".
++ $I.'$JAVA_HOME'.$INCLUDE.
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."linux".
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".
++ $I.$XINC.
++ $I.$GCC_INCLUDE.
++ $I.$USR.$INCLUDE.'"';
+ }
+ elsif ($platform eq "$Linux")
+ { $SOLARINC .= $I.$GXX_INCLUDE.
diff --git a/editors/openoffice-1.1-devel/Makefile b/editors/openoffice-1.1-devel/Makefile
index d510844e3a06..664b4dc13769 100644
--- a/editors/openoffice-1.1-devel/Makefile
+++ b/editors/openoffice-1.1-devel/Makefile
@@ -1,3 +1,4 @@
+# ex:ts=8
# New ports collection makefile for: StarOffice 5.2
# Date created: 22 August 2000
# Whom: Martin Blapp
@@ -5,91 +6,18 @@
# $FreeBSD$
#
-PORTNAME= staroffice
-PORTVERSION= 5.2
-CATEGORIES= editors linux
-MASTER_SITES= ftp://ftp.inf.utfsm.cl/pub/UTFSM/StarOffice_5.2/ \
- ftp://ftp.snerpa.is/pub/linux/ \
- ftp://ftp.osb.hu/pub/mirrors/staroffice/linux/ \
- ftp://ftp.uni-linz.ac.at/pub/staroffice_5.2/ \
- ftp://ftp.labyrinth.net.au/.5/kk/linux/star_office/ \
- ftp://ftp.acs.oakland.edu/files/Linux/StarOffice/office52/ \
- ftp://ftp.ctio.noao.edu/linux/ \
- ftp://sunsite.cnlab-switch.ch/mirror/staroffice/english/ \
- ftp://ftp.linux.tucows.com/pub/Linuxberg/ \
- ftp://ftp.jcu.edu.au/pub/StarOffice/ \
- ftp://ftp.uakom.sk/pub/mirrors/StarOffice/ \
- ftp://ftp.linux.hr/pub/staroffice/5.2/
-DISTNAME= so-5_2-ga-bin-linux-en.bin
-DISTFILES= soa-5_2-ga-bin-linux-en.bin so-5_2-ga-bin-linux-en.bin
-EXTRACT_ONLY=
+PORTNAME= openoffice
+PORTVERSION= 6.0.a605
+CATEGORIES= editors
+MASTER_SITES= http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
+DISTNAME= oo_605_src
-MAINTAINER= mb@imp.ch
+MAINTAINER= obrien@FreeBSD.org
-FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-
-ONLY_FOR_ARCHS= i386
-NO_CDROM= 'Must be downloaded direct from Sun via www interface'
-IS_INTERACTIVE= yes
-NO_BUILD= yes
-DIST_SUBDIR= staroffice52
-WRKSRC= ${WRKDIR}/office52
-TMPDIR= ${WRKDIR}/tmp
-LD_PATH= ${TMPDIR}:${WRKSRC}:${LINUXBASE}/lib:${LINUXBASE}/usr/lib
+CONFIGURE_WRKSRC= ${WRKSRC}/config_office
.include <bsd.port.pre.mk>
-pre-fetch:
-.if ${OSVERSION} < 410000
- @${ECHO}
- @${ECHO} OS-VERSION ${OSVERSION}
- @${ECHO}
- @${ECHO} Staroffice depends on a scripting fix for
- @${ECHO} /usr/src/sys/i386/linux/linux_sysvec.c
- @${ECHO} \(revision 1.55.2.1 or higher\)
- @${ECHO}
- @${ECHO} Please upgrade to FreeBSD 4.1
- @${ECHO}
- @${FALSE}
-.endif
-.if defined(WITH_CDROM)
-.if !exists(${CD_MOUNTPT}/linux/office52/setup)
- @${ECHO}
- @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
- @${ECHO} onto /cdrom and run make again.
- @${ECHO}
- @${FALSE}
-.endif
-.endif
-
-.if defined(WITH_CDROM)
-do-extract:
- @${MKDIR} ${WRKSRC}/office52
- @cd ${WRKSRC}/office52 && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
-.endif
-
-do-extract:
-.if !defined(DISPLAY) || ${DISPLAY} == ""
- @ ${ECHO}
- @ ${ECHO} Can\'t open display:
- @ ${ECHO} Please check your DISPLAY variable.
- @ ${ECHO}
- @ ${FALSE}
-.else
- @${MKDIR} ${WRKSRC}
- @${MKDIR} ${TMPDIR}
- @${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC}
- @${CP} ${_DISTDIR}/soa-5_2-ga-bin-linux-en.bin ${WRKSRC}
- @${CHMOD} 755 ${WRKSRC}/${DISTNAME}
- @${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
- @cd ${WRKSRC}
- @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
- @cd ../../
-.endif
-
-post-configure:
- @${PERL} -pi.orig -e 's|DefaultDestPath = "office52";|DefaultDestPath = "${PREFIX}/office52";|' ${WRKSRC}/setup.ins
-
do-install:
.if !defined(DISPLAY) || ${DISPLAY} == ""
@ ${ECHO}
diff --git a/editors/openoffice-1.1-devel/distinfo b/editors/openoffice-1.1-devel/distinfo
index f1e7894f7587..bc002ffc38b1 100644
--- a/editors/openoffice-1.1-devel/distinfo
+++ b/editors/openoffice-1.1-devel/distinfo
@@ -1,2 +1 @@
-MD5 (staroffice52/soa-5_2-ga-bin-linux-en.bin) = 8f36a55d7cefd919febdefb502ae986d
-MD5 (staroffice52/so-5_2-ga-bin-linux-en.bin) = 1f03de10b6127772ba87567d334aeb4d
+MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
diff --git a/editors/openoffice-1.1-devel/files/patch-bootstrap.1 b/editors/openoffice-1.1-devel/files/patch-bootstrap.1
new file mode 100644
index 000000000000..fc625e321cca
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-bootstrap.1
@@ -0,0 +1,11 @@
+--- config_office/bootstrap.1.orig Mon Sep 18 09:13:24 2000
++++ config_office/bootstrap.1 Fri Oct 13 17:51:37 2000
+@@ -9,6 +9,8 @@
+ make linux
+ else if ($platform == "Darwin") then
+ make macosx
++else if ($platform == "FreeBSD") then
++ make linux
+ endif
+
+ if "$?" != "0" exit
diff --git a/editors/openoffice-1.1-devel/files/patch-configure b/editors/openoffice-1.1-devel/files/patch-configure
new file mode 100644
index 000000000000..744225fe9d31
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-configure
@@ -0,0 +1,11 @@
+--- config_office/configure.orig Thu Oct 12 02:34:03 2000
++++ config_office/configure Fri Oct 13 17:52:25 2000
+@@ -739,7 +739,7 @@
+ echo $ac_n "checking the operating system""... $ac_c" 1>&6
+ echo "configure:741: checking the operating system" >&5
+ _os=`uname`
+-if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin"; then
++if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin" -o "$_os" = "FreeBSD"; then
+ echo "$ac_t""checked ($_os)" 1>&6
+ else
+ { echo "configure: error: $_os operating system is not suitable to build OpenOffice!" 1>&2; exit 1; }
diff --git a/editors/openoffice-1.1-devel/files/patch-set_soenv.1 b/editors/openoffice-1.1-devel/files/patch-set_soenv.1
new file mode 100644
index 000000000000..d18d3038c06b
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-set_soenv.1
@@ -0,0 +1,218 @@
+--- config_office/set_soenv.1.orig Thu Oct 12 10:16:28 2000
++++ config_office/set_soenv.1 Sun Oct 15 23:12:53 2000
+@@ -11,7 +11,7 @@
+ # Description:
+ # set_soenv generates a file that contains all necessary
+ # environment variables for the build proces of OpenOffice
+-# on Linux, Solaris, Windows NT and Macosx.
++# on Linux, Solaris, FreeBSD, Windows NT and Macosx.
+ # This script prompts the installer to enter:
+ # 1. (if necessary) The directory where the jdk is located (JAVA_HOME).
+ # 2. (if necessary) The directory where the Microsoft C/C++ compiler is located (COMPATH).
+@@ -53,7 +53,7 @@
+ #--------------------------------------------------------
+ #
+ my ( $outfile, $bootfile, $newline, $comment, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,
+- $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $Winnt, $Macosx, $WScomp,
++ $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Freebsd, $Linux, $Winnt, $Macosx, $WScomp,
+ $GNUcomp, $platform, $machine_type, $empty, $no_jdk, $no_tcsh, $no_cl, $no_gcc, $no_gcc_home, $no_gcc_include,
+ $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $win_format_var);
+ #
+@@ -121,6 +121,7 @@
+ $L = " -L"; # library search path
+ $D = " -D"; # define search path
+ $Solaris = "SunOS"; # return of uname command on Solaris
++$Freebsd = "FreeBSD"; # return of uname command on FreeBSD
+ $Linux = "Linux"; # return of uname command on Linux
+ $Winnt = "WINNT"; # return of uname command on Windows NT
+ $Macosx = "Darwin"; # return of uname command on Macosx
+@@ -162,8 +163,8 @@
+ #
+ $platform = `uname`; # probing the platform
+ chomp( $platform );
+-if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) )
+-{ die "This script is only suitable for the Solaris, Linux, Windows NT or Macosx platform!\n";
++if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) ) && ( $platform ne $Freebsd )
++{ die "This script is only suitable for the Solaris, FreeBSD, Linux, Windows NT or Macosx platform!\n";
+ }
+ else
+ { if ( $platform eq $Solaris )
+@@ -254,6 +255,54 @@
+ $PROSWITCH = "-DPRODUCT";
+ $XPVERSION = "3";
+ }
++elsif ( $platform eq "$Freebsd" )
++{ if ($machine_type eq "i686")
++ { print "Setting FreeBSD Intel specific values... ";
++ $outfile = "LinuxIntelEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "I";
++ $CPUNAME = "INTEL";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngi3";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ else
++ { if ($machine_type eq "alpha")
++ { print "Setting FreeBSD/Alpha specific values... ";
++ $outfile = "FreeBSDAlphaEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "S";
++ $CPUNAME = "ALPHA";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngs";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ }
++}
+ elsif ( $platform eq "$Linux" )
+ { if ($machine_type eq "i686")
+ { print "Setting Linux Intel specific values... ";
+@@ -430,7 +479,7 @@
+ }
+ # 4. Gcc path.
+ # Check whether autoconf found the compiler path.
+-if ($platform eq $Linux)
++if ($platform eq $Linux) -o ($platform eq $Freebsd)
+ { if ( $ARGV[ 0 ] eq $no_gcc)
+ { AddWarning( "set_soenv", "Autoconf did not find correct gcc compiler, prompted for value" );
+ printf "Did you build gcc 2.95.2 from source using the --prefix and --enable-shared flags (y/n)?: ";
+@@ -643,6 +692,13 @@
+ $ps.$par_dir.$LIB.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $LD_LIBRARY_PATH = $cur_dir.
++ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
++ $ps.$USR_LOCAL.$LIB.
++ $ps.$par_dir.$LIB.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $LD_LIBRARY_PATH = $cur_dir.
+ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
+@@ -681,6 +737,21 @@
+ $D."PRODUCT".
+ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARDEF = '"'.$D."UNX".
++ $D.$COM.
++ $D.$CVER.
++ $D.$GVER.
++ $D."_PTHREADS".
++ $D.$OS.
++ $D.$CPUNAME.
++ $D."X86".
++ $D."_REENTRANT".
++ $D."_POSIX_PTHREAD_SEMANTICS".
++ $D."SUPD=$UPD".
++ $D."PRODUCT".
++ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARDEF = '"'.$D."UNX".
+ $D.$COM.
+@@ -707,6 +778,12 @@
+ $L.$USR_DT.$LIB.
+ $L.$USR_OPENWIN.$LIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
++ $L.$LIB.
++ $L.$USR.$LIB.
++ $L.$USR.$LOCAL.$LIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
+ $L.$LIB.
+@@ -721,6 +798,9 @@
+ if ($platform eq "$Solaris")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
+@@ -790,6 +870,20 @@
+ $ps.$USR_DT.$BIN.
+ $ps.$USR.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $PATH = $cur_dir.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
++ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
++ $ps.'$SOLARENV'.$BIN.
++ $ps.'$JAVA_HOME'.$BIN;
++
++ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
++
++ $PATH .= $ps.$USR.$ds."sbin".
++ $ps.$ETC.
++ $ps.$USR.$BIN.$ds."X11".
++ $ps.$USR.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $PATH = $cur_dir.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
+@@ -861,6 +955,17 @@
+ $L.'$JAVA_HOME'.$LIB.
+ $L.$XLIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARLIB = '"'.$L.$par_dir.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.$LIB.
++ $L.$USR_LIB.
++ $L.$USR_LOCAL.$LIB.
++ $L.'$JAVA_HOME'.$LIB.
++ $L.$XLIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARLIB = '"'.$L.$par_dir.$LIB.
+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+@@ -898,6 +1003,16 @@
+ $I.'$JAVA_HOME'.$INCLUDE.
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."solaris".
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".'"';
++}
++elsif ($platform eq "$Freebsd")
++{ $SOLARINC .= $I.$GXX_INCLUDE.
++ $I.'$SOLARENV'.$INC.$ds."Xp31".
++ $I.'$JAVA_HOME'.$INCLUDE.
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."linux".
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".
++ $I.$XINC.
++ $I.$GCC_INCLUDE.
++ $I.$USR.$INCLUDE.'"';
+ }
+ elsif ($platform eq "$Linux")
+ { $SOLARINC .= $I.$GXX_INCLUDE.
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile
index d510844e3a06..664b4dc13769 100644
--- a/editors/openoffice-1.1/Makefile
+++ b/editors/openoffice-1.1/Makefile
@@ -1,3 +1,4 @@
+# ex:ts=8
# New ports collection makefile for: StarOffice 5.2
# Date created: 22 August 2000
# Whom: Martin Blapp
@@ -5,91 +6,18 @@
# $FreeBSD$
#
-PORTNAME= staroffice
-PORTVERSION= 5.2
-CATEGORIES= editors linux
-MASTER_SITES= ftp://ftp.inf.utfsm.cl/pub/UTFSM/StarOffice_5.2/ \
- ftp://ftp.snerpa.is/pub/linux/ \
- ftp://ftp.osb.hu/pub/mirrors/staroffice/linux/ \
- ftp://ftp.uni-linz.ac.at/pub/staroffice_5.2/ \
- ftp://ftp.labyrinth.net.au/.5/kk/linux/star_office/ \
- ftp://ftp.acs.oakland.edu/files/Linux/StarOffice/office52/ \
- ftp://ftp.ctio.noao.edu/linux/ \
- ftp://sunsite.cnlab-switch.ch/mirror/staroffice/english/ \
- ftp://ftp.linux.tucows.com/pub/Linuxberg/ \
- ftp://ftp.jcu.edu.au/pub/StarOffice/ \
- ftp://ftp.uakom.sk/pub/mirrors/StarOffice/ \
- ftp://ftp.linux.hr/pub/staroffice/5.2/
-DISTNAME= so-5_2-ga-bin-linux-en.bin
-DISTFILES= soa-5_2-ga-bin-linux-en.bin so-5_2-ga-bin-linux-en.bin
-EXTRACT_ONLY=
+PORTNAME= openoffice
+PORTVERSION= 6.0.a605
+CATEGORIES= editors
+MASTER_SITES= http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
+DISTNAME= oo_605_src
-MAINTAINER= mb@imp.ch
+MAINTAINER= obrien@FreeBSD.org
-FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-
-ONLY_FOR_ARCHS= i386
-NO_CDROM= 'Must be downloaded direct from Sun via www interface'
-IS_INTERACTIVE= yes
-NO_BUILD= yes
-DIST_SUBDIR= staroffice52
-WRKSRC= ${WRKDIR}/office52
-TMPDIR= ${WRKDIR}/tmp
-LD_PATH= ${TMPDIR}:${WRKSRC}:${LINUXBASE}/lib:${LINUXBASE}/usr/lib
+CONFIGURE_WRKSRC= ${WRKSRC}/config_office
.include <bsd.port.pre.mk>
-pre-fetch:
-.if ${OSVERSION} < 410000
- @${ECHO}
- @${ECHO} OS-VERSION ${OSVERSION}
- @${ECHO}
- @${ECHO} Staroffice depends on a scripting fix for
- @${ECHO} /usr/src/sys/i386/linux/linux_sysvec.c
- @${ECHO} \(revision 1.55.2.1 or higher\)
- @${ECHO}
- @${ECHO} Please upgrade to FreeBSD 4.1
- @${ECHO}
- @${FALSE}
-.endif
-.if defined(WITH_CDROM)
-.if !exists(${CD_MOUNTPT}/linux/office52/setup)
- @${ECHO}
- @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
- @${ECHO} onto /cdrom and run make again.
- @${ECHO}
- @${FALSE}
-.endif
-.endif
-
-.if defined(WITH_CDROM)
-do-extract:
- @${MKDIR} ${WRKSRC}/office52
- @cd ${WRKSRC}/office52 && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
-.endif
-
-do-extract:
-.if !defined(DISPLAY) || ${DISPLAY} == ""
- @ ${ECHO}
- @ ${ECHO} Can\'t open display:
- @ ${ECHO} Please check your DISPLAY variable.
- @ ${ECHO}
- @ ${FALSE}
-.else
- @${MKDIR} ${WRKSRC}
- @${MKDIR} ${TMPDIR}
- @${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC}
- @${CP} ${_DISTDIR}/soa-5_2-ga-bin-linux-en.bin ${WRKSRC}
- @${CHMOD} 755 ${WRKSRC}/${DISTNAME}
- @${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
- @cd ${WRKSRC}
- @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
- @cd ../../
-.endif
-
-post-configure:
- @${PERL} -pi.orig -e 's|DefaultDestPath = "office52";|DefaultDestPath = "${PREFIX}/office52";|' ${WRKSRC}/setup.ins
-
do-install:
.if !defined(DISPLAY) || ${DISPLAY} == ""
@ ${ECHO}
diff --git a/editors/openoffice-1.1/distinfo b/editors/openoffice-1.1/distinfo
index f1e7894f7587..bc002ffc38b1 100644
--- a/editors/openoffice-1.1/distinfo
+++ b/editors/openoffice-1.1/distinfo
@@ -1,2 +1 @@
-MD5 (staroffice52/soa-5_2-ga-bin-linux-en.bin) = 8f36a55d7cefd919febdefb502ae986d
-MD5 (staroffice52/so-5_2-ga-bin-linux-en.bin) = 1f03de10b6127772ba87567d334aeb4d
+MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
diff --git a/editors/openoffice-1.1/files/patch-bootstrap.1 b/editors/openoffice-1.1/files/patch-bootstrap.1
new file mode 100644
index 000000000000..fc625e321cca
--- /dev/null
+++ b/editors/openoffice-1.1/files/patch-bootstrap.1
@@ -0,0 +1,11 @@
+--- config_office/bootstrap.1.orig Mon Sep 18 09:13:24 2000
++++ config_office/bootstrap.1 Fri Oct 13 17:51:37 2000
+@@ -9,6 +9,8 @@
+ make linux
+ else if ($platform == "Darwin") then
+ make macosx
++else if ($platform == "FreeBSD") then
++ make linux
+ endif
+
+ if "$?" != "0" exit
diff --git a/editors/openoffice-1.1/files/patch-configure b/editors/openoffice-1.1/files/patch-configure
new file mode 100644
index 000000000000..744225fe9d31
--- /dev/null
+++ b/editors/openoffice-1.1/files/patch-configure
@@ -0,0 +1,11 @@
+--- config_office/configure.orig Thu Oct 12 02:34:03 2000
++++ config_office/configure Fri Oct 13 17:52:25 2000
+@@ -739,7 +739,7 @@
+ echo $ac_n "checking the operating system""... $ac_c" 1>&6
+ echo "configure:741: checking the operating system" >&5
+ _os=`uname`
+-if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin"; then
++if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin" -o "$_os" = "FreeBSD"; then
+ echo "$ac_t""checked ($_os)" 1>&6
+ else
+ { echo "configure: error: $_os operating system is not suitable to build OpenOffice!" 1>&2; exit 1; }
diff --git a/editors/openoffice-1.1/files/patch-set_soenv.1 b/editors/openoffice-1.1/files/patch-set_soenv.1
new file mode 100644
index 000000000000..d18d3038c06b
--- /dev/null
+++ b/editors/openoffice-1.1/files/patch-set_soenv.1
@@ -0,0 +1,218 @@
+--- config_office/set_soenv.1.orig Thu Oct 12 10:16:28 2000
++++ config_office/set_soenv.1 Sun Oct 15 23:12:53 2000
+@@ -11,7 +11,7 @@
+ # Description:
+ # set_soenv generates a file that contains all necessary
+ # environment variables for the build proces of OpenOffice
+-# on Linux, Solaris, Windows NT and Macosx.
++# on Linux, Solaris, FreeBSD, Windows NT and Macosx.
+ # This script prompts the installer to enter:
+ # 1. (if necessary) The directory where the jdk is located (JAVA_HOME).
+ # 2. (if necessary) The directory where the Microsoft C/C++ compiler is located (COMPATH).
+@@ -53,7 +53,7 @@
+ #--------------------------------------------------------
+ #
+ my ( $outfile, $bootfile, $newline, $comment, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,
+- $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $Winnt, $Macosx, $WScomp,
++ $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Freebsd, $Linux, $Winnt, $Macosx, $WScomp,
+ $GNUcomp, $platform, $machine_type, $empty, $no_jdk, $no_tcsh, $no_cl, $no_gcc, $no_gcc_home, $no_gcc_include,
+ $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $win_format_var);
+ #
+@@ -121,6 +121,7 @@
+ $L = " -L"; # library search path
+ $D = " -D"; # define search path
+ $Solaris = "SunOS"; # return of uname command on Solaris
++$Freebsd = "FreeBSD"; # return of uname command on FreeBSD
+ $Linux = "Linux"; # return of uname command on Linux
+ $Winnt = "WINNT"; # return of uname command on Windows NT
+ $Macosx = "Darwin"; # return of uname command on Macosx
+@@ -162,8 +163,8 @@
+ #
+ $platform = `uname`; # probing the platform
+ chomp( $platform );
+-if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) )
+-{ die "This script is only suitable for the Solaris, Linux, Windows NT or Macosx platform!\n";
++if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) ) && ( $platform ne $Freebsd )
++{ die "This script is only suitable for the Solaris, FreeBSD, Linux, Windows NT or Macosx platform!\n";
+ }
+ else
+ { if ( $platform eq $Solaris )
+@@ -254,6 +255,54 @@
+ $PROSWITCH = "-DPRODUCT";
+ $XPVERSION = "3";
+ }
++elsif ( $platform eq "$Freebsd" )
++{ if ($machine_type eq "i686")
++ { print "Setting FreeBSD Intel specific values... ";
++ $outfile = "LinuxIntelEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "I";
++ $CPUNAME = "INTEL";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngi3";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ else
++ { if ($machine_type eq "alpha")
++ { print "Setting FreeBSD/Alpha specific values... ";
++ $outfile = "FreeBSDAlphaEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "S";
++ $CPUNAME = "ALPHA";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngs";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ }
++}
+ elsif ( $platform eq "$Linux" )
+ { if ($machine_type eq "i686")
+ { print "Setting Linux Intel specific values... ";
+@@ -430,7 +479,7 @@
+ }
+ # 4. Gcc path.
+ # Check whether autoconf found the compiler path.
+-if ($platform eq $Linux)
++if ($platform eq $Linux) -o ($platform eq $Freebsd)
+ { if ( $ARGV[ 0 ] eq $no_gcc)
+ { AddWarning( "set_soenv", "Autoconf did not find correct gcc compiler, prompted for value" );
+ printf "Did you build gcc 2.95.2 from source using the --prefix and --enable-shared flags (y/n)?: ";
+@@ -643,6 +692,13 @@
+ $ps.$par_dir.$LIB.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $LD_LIBRARY_PATH = $cur_dir.
++ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
++ $ps.$USR_LOCAL.$LIB.
++ $ps.$par_dir.$LIB.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $LD_LIBRARY_PATH = $cur_dir.
+ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
+@@ -681,6 +737,21 @@
+ $D."PRODUCT".
+ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARDEF = '"'.$D."UNX".
++ $D.$COM.
++ $D.$CVER.
++ $D.$GVER.
++ $D."_PTHREADS".
++ $D.$OS.
++ $D.$CPUNAME.
++ $D."X86".
++ $D."_REENTRANT".
++ $D."_POSIX_PTHREAD_SEMANTICS".
++ $D."SUPD=$UPD".
++ $D."PRODUCT".
++ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARDEF = '"'.$D."UNX".
+ $D.$COM.
+@@ -707,6 +778,12 @@
+ $L.$USR_DT.$LIB.
+ $L.$USR_OPENWIN.$LIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
++ $L.$LIB.
++ $L.$USR.$LIB.
++ $L.$USR.$LOCAL.$LIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
+ $L.$LIB.
+@@ -721,6 +798,9 @@
+ if ($platform eq "$Solaris")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
+@@ -790,6 +870,20 @@
+ $ps.$USR_DT.$BIN.
+ $ps.$USR.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $PATH = $cur_dir.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
++ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
++ $ps.'$SOLARENV'.$BIN.
++ $ps.'$JAVA_HOME'.$BIN;
++
++ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
++
++ $PATH .= $ps.$USR.$ds."sbin".
++ $ps.$ETC.
++ $ps.$USR.$BIN.$ds."X11".
++ $ps.$USR.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $PATH = $cur_dir.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
+@@ -861,6 +955,17 @@
+ $L.'$JAVA_HOME'.$LIB.
+ $L.$XLIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARLIB = '"'.$L.$par_dir.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.$LIB.
++ $L.$USR_LIB.
++ $L.$USR_LOCAL.$LIB.
++ $L.'$JAVA_HOME'.$LIB.
++ $L.$XLIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARLIB = '"'.$L.$par_dir.$LIB.
+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+@@ -898,6 +1003,16 @@
+ $I.'$JAVA_HOME'.$INCLUDE.
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."solaris".
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".'"';
++}
++elsif ($platform eq "$Freebsd")
++{ $SOLARINC .= $I.$GXX_INCLUDE.
++ $I.'$SOLARENV'.$INC.$ds."Xp31".
++ $I.'$JAVA_HOME'.$INCLUDE.
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."linux".
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".
++ $I.$XINC.
++ $I.$GCC_INCLUDE.
++ $I.$USR.$INCLUDE.'"';
+ }
+ elsif ($platform eq "$Linux")
+ { $SOLARINC .= $I.$GXX_INCLUDE.
diff --git a/editors/openoffice-2.0-devel/Makefile b/editors/openoffice-2.0-devel/Makefile
index d510844e3a06..664b4dc13769 100644
--- a/editors/openoffice-2.0-devel/Makefile
+++ b/editors/openoffice-2.0-devel/Makefile
@@ -1,3 +1,4 @@
+# ex:ts=8
# New ports collection makefile for: StarOffice 5.2
# Date created: 22 August 2000
# Whom: Martin Blapp
@@ -5,91 +6,18 @@
# $FreeBSD$
#
-PORTNAME= staroffice
-PORTVERSION= 5.2
-CATEGORIES= editors linux
-MASTER_SITES= ftp://ftp.inf.utfsm.cl/pub/UTFSM/StarOffice_5.2/ \
- ftp://ftp.snerpa.is/pub/linux/ \
- ftp://ftp.osb.hu/pub/mirrors/staroffice/linux/ \
- ftp://ftp.uni-linz.ac.at/pub/staroffice_5.2/ \
- ftp://ftp.labyrinth.net.au/.5/kk/linux/star_office/ \
- ftp://ftp.acs.oakland.edu/files/Linux/StarOffice/office52/ \
- ftp://ftp.ctio.noao.edu/linux/ \
- ftp://sunsite.cnlab-switch.ch/mirror/staroffice/english/ \
- ftp://ftp.linux.tucows.com/pub/Linuxberg/ \
- ftp://ftp.jcu.edu.au/pub/StarOffice/ \
- ftp://ftp.uakom.sk/pub/mirrors/StarOffice/ \
- ftp://ftp.linux.hr/pub/staroffice/5.2/
-DISTNAME= so-5_2-ga-bin-linux-en.bin
-DISTFILES= soa-5_2-ga-bin-linux-en.bin so-5_2-ga-bin-linux-en.bin
-EXTRACT_ONLY=
+PORTNAME= openoffice
+PORTVERSION= 6.0.a605
+CATEGORIES= editors
+MASTER_SITES= http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
+DISTNAME= oo_605_src
-MAINTAINER= mb@imp.ch
+MAINTAINER= obrien@FreeBSD.org
-FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-
-ONLY_FOR_ARCHS= i386
-NO_CDROM= 'Must be downloaded direct from Sun via www interface'
-IS_INTERACTIVE= yes
-NO_BUILD= yes
-DIST_SUBDIR= staroffice52
-WRKSRC= ${WRKDIR}/office52
-TMPDIR= ${WRKDIR}/tmp
-LD_PATH= ${TMPDIR}:${WRKSRC}:${LINUXBASE}/lib:${LINUXBASE}/usr/lib
+CONFIGURE_WRKSRC= ${WRKSRC}/config_office
.include <bsd.port.pre.mk>
-pre-fetch:
-.if ${OSVERSION} < 410000
- @${ECHO}
- @${ECHO} OS-VERSION ${OSVERSION}
- @${ECHO}
- @${ECHO} Staroffice depends on a scripting fix for
- @${ECHO} /usr/src/sys/i386/linux/linux_sysvec.c
- @${ECHO} \(revision 1.55.2.1 or higher\)
- @${ECHO}
- @${ECHO} Please upgrade to FreeBSD 4.1
- @${ECHO}
- @${FALSE}
-.endif
-.if defined(WITH_CDROM)
-.if !exists(${CD_MOUNTPT}/linux/office52/setup)
- @${ECHO}
- @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
- @${ECHO} onto /cdrom and run make again.
- @${ECHO}
- @${FALSE}
-.endif
-.endif
-
-.if defined(WITH_CDROM)
-do-extract:
- @${MKDIR} ${WRKSRC}/office52
- @cd ${WRKSRC}/office52 && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
-.endif
-
-do-extract:
-.if !defined(DISPLAY) || ${DISPLAY} == ""
- @ ${ECHO}
- @ ${ECHO} Can\'t open display:
- @ ${ECHO} Please check your DISPLAY variable.
- @ ${ECHO}
- @ ${FALSE}
-.else
- @${MKDIR} ${WRKSRC}
- @${MKDIR} ${TMPDIR}
- @${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC}
- @${CP} ${_DISTDIR}/soa-5_2-ga-bin-linux-en.bin ${WRKSRC}
- @${CHMOD} 755 ${WRKSRC}/${DISTNAME}
- @${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
- @cd ${WRKSRC}
- @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
- @cd ../../
-.endif
-
-post-configure:
- @${PERL} -pi.orig -e 's|DefaultDestPath = "office52";|DefaultDestPath = "${PREFIX}/office52";|' ${WRKSRC}/setup.ins
-
do-install:
.if !defined(DISPLAY) || ${DISPLAY} == ""
@ ${ECHO}
diff --git a/editors/openoffice-2.0-devel/distinfo b/editors/openoffice-2.0-devel/distinfo
index f1e7894f7587..bc002ffc38b1 100644
--- a/editors/openoffice-2.0-devel/distinfo
+++ b/editors/openoffice-2.0-devel/distinfo
@@ -1,2 +1 @@
-MD5 (staroffice52/soa-5_2-ga-bin-linux-en.bin) = 8f36a55d7cefd919febdefb502ae986d
-MD5 (staroffice52/so-5_2-ga-bin-linux-en.bin) = 1f03de10b6127772ba87567d334aeb4d
+MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
diff --git a/editors/openoffice-2.0-devel/files/patch-bootstrap.1 b/editors/openoffice-2.0-devel/files/patch-bootstrap.1
new file mode 100644
index 000000000000..fc625e321cca
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-bootstrap.1
@@ -0,0 +1,11 @@
+--- config_office/bootstrap.1.orig Mon Sep 18 09:13:24 2000
++++ config_office/bootstrap.1 Fri Oct 13 17:51:37 2000
+@@ -9,6 +9,8 @@
+ make linux
+ else if ($platform == "Darwin") then
+ make macosx
++else if ($platform == "FreeBSD") then
++ make linux
+ endif
+
+ if "$?" != "0" exit
diff --git a/editors/openoffice-2.0-devel/files/patch-configure b/editors/openoffice-2.0-devel/files/patch-configure
new file mode 100644
index 000000000000..744225fe9d31
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-configure
@@ -0,0 +1,11 @@
+--- config_office/configure.orig Thu Oct 12 02:34:03 2000
++++ config_office/configure Fri Oct 13 17:52:25 2000
+@@ -739,7 +739,7 @@
+ echo $ac_n "checking the operating system""... $ac_c" 1>&6
+ echo "configure:741: checking the operating system" >&5
+ _os=`uname`
+-if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin"; then
++if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin" -o "$_os" = "FreeBSD"; then
+ echo "$ac_t""checked ($_os)" 1>&6
+ else
+ { echo "configure: error: $_os operating system is not suitable to build OpenOffice!" 1>&2; exit 1; }
diff --git a/editors/openoffice-2.0-devel/files/patch-set_soenv.1 b/editors/openoffice-2.0-devel/files/patch-set_soenv.1
new file mode 100644
index 000000000000..d18d3038c06b
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-set_soenv.1
@@ -0,0 +1,218 @@
+--- config_office/set_soenv.1.orig Thu Oct 12 10:16:28 2000
++++ config_office/set_soenv.1 Sun Oct 15 23:12:53 2000
+@@ -11,7 +11,7 @@
+ # Description:
+ # set_soenv generates a file that contains all necessary
+ # environment variables for the build proces of OpenOffice
+-# on Linux, Solaris, Windows NT and Macosx.
++# on Linux, Solaris, FreeBSD, Windows NT and Macosx.
+ # This script prompts the installer to enter:
+ # 1. (if necessary) The directory where the jdk is located (JAVA_HOME).
+ # 2. (if necessary) The directory where the Microsoft C/C++ compiler is located (COMPATH).
+@@ -53,7 +53,7 @@
+ #--------------------------------------------------------
+ #
+ my ( $outfile, $bootfile, $newline, $comment, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,
+- $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $Winnt, $Macosx, $WScomp,
++ $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Freebsd, $Linux, $Winnt, $Macosx, $WScomp,
+ $GNUcomp, $platform, $machine_type, $empty, $no_jdk, $no_tcsh, $no_cl, $no_gcc, $no_gcc_home, $no_gcc_include,
+ $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $win_format_var);
+ #
+@@ -121,6 +121,7 @@
+ $L = " -L"; # library search path
+ $D = " -D"; # define search path
+ $Solaris = "SunOS"; # return of uname command on Solaris
++$Freebsd = "FreeBSD"; # return of uname command on FreeBSD
+ $Linux = "Linux"; # return of uname command on Linux
+ $Winnt = "WINNT"; # return of uname command on Windows NT
+ $Macosx = "Darwin"; # return of uname command on Macosx
+@@ -162,8 +163,8 @@
+ #
+ $platform = `uname`; # probing the platform
+ chomp( $platform );
+-if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) )
+-{ die "This script is only suitable for the Solaris, Linux, Windows NT or Macosx platform!\n";
++if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) ) && ( $platform ne $Freebsd )
++{ die "This script is only suitable for the Solaris, FreeBSD, Linux, Windows NT or Macosx platform!\n";
+ }
+ else
+ { if ( $platform eq $Solaris )
+@@ -254,6 +255,54 @@
+ $PROSWITCH = "-DPRODUCT";
+ $XPVERSION = "3";
+ }
++elsif ( $platform eq "$Freebsd" )
++{ if ($machine_type eq "i686")
++ { print "Setting FreeBSD Intel specific values... ";
++ $outfile = "LinuxIntelEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "I";
++ $CPUNAME = "INTEL";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngi3";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ else
++ { if ($machine_type eq "alpha")
++ { print "Setting FreeBSD/Alpha specific values... ";
++ $outfile = "FreeBSDAlphaEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "S";
++ $CPUNAME = "ALPHA";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngs";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ }
++}
+ elsif ( $platform eq "$Linux" )
+ { if ($machine_type eq "i686")
+ { print "Setting Linux Intel specific values... ";
+@@ -430,7 +479,7 @@
+ }
+ # 4. Gcc path.
+ # Check whether autoconf found the compiler path.
+-if ($platform eq $Linux)
++if ($platform eq $Linux) -o ($platform eq $Freebsd)
+ { if ( $ARGV[ 0 ] eq $no_gcc)
+ { AddWarning( "set_soenv", "Autoconf did not find correct gcc compiler, prompted for value" );
+ printf "Did you build gcc 2.95.2 from source using the --prefix and --enable-shared flags (y/n)?: ";
+@@ -643,6 +692,13 @@
+ $ps.$par_dir.$LIB.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $LD_LIBRARY_PATH = $cur_dir.
++ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
++ $ps.$USR_LOCAL.$LIB.
++ $ps.$par_dir.$LIB.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $LD_LIBRARY_PATH = $cur_dir.
+ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
+@@ -681,6 +737,21 @@
+ $D."PRODUCT".
+ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARDEF = '"'.$D."UNX".
++ $D.$COM.
++ $D.$CVER.
++ $D.$GVER.
++ $D."_PTHREADS".
++ $D.$OS.
++ $D.$CPUNAME.
++ $D."X86".
++ $D."_REENTRANT".
++ $D."_POSIX_PTHREAD_SEMANTICS".
++ $D."SUPD=$UPD".
++ $D."PRODUCT".
++ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARDEF = '"'.$D."UNX".
+ $D.$COM.
+@@ -707,6 +778,12 @@
+ $L.$USR_DT.$LIB.
+ $L.$USR_OPENWIN.$LIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
++ $L.$LIB.
++ $L.$USR.$LIB.
++ $L.$USR.$LOCAL.$LIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
+ $L.$LIB.
+@@ -721,6 +798,9 @@
+ if ($platform eq "$Solaris")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
+@@ -790,6 +870,20 @@
+ $ps.$USR_DT.$BIN.
+ $ps.$USR.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $PATH = $cur_dir.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
++ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
++ $ps.'$SOLARENV'.$BIN.
++ $ps.'$JAVA_HOME'.$BIN;
++
++ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
++
++ $PATH .= $ps.$USR.$ds."sbin".
++ $ps.$ETC.
++ $ps.$USR.$BIN.$ds."X11".
++ $ps.$USR.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $PATH = $cur_dir.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
+@@ -861,6 +955,17 @@
+ $L.'$JAVA_HOME'.$LIB.
+ $L.$XLIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARLIB = '"'.$L.$par_dir.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.$LIB.
++ $L.$USR_LIB.
++ $L.$USR_LOCAL.$LIB.
++ $L.'$JAVA_HOME'.$LIB.
++ $L.$XLIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARLIB = '"'.$L.$par_dir.$LIB.
+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+@@ -898,6 +1003,16 @@
+ $I.'$JAVA_HOME'.$INCLUDE.
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."solaris".
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".'"';
++}
++elsif ($platform eq "$Freebsd")
++{ $SOLARINC .= $I.$GXX_INCLUDE.
++ $I.'$SOLARENV'.$INC.$ds."Xp31".
++ $I.'$JAVA_HOME'.$INCLUDE.
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."linux".
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".
++ $I.$XINC.
++ $I.$GCC_INCLUDE.
++ $I.$USR.$INCLUDE.'"';
+ }
+ elsif ($platform eq "$Linux")
+ { $SOLARINC .= $I.$GXX_INCLUDE.
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index d510844e3a06..664b4dc13769 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -1,3 +1,4 @@
+# ex:ts=8
# New ports collection makefile for: StarOffice 5.2
# Date created: 22 August 2000
# Whom: Martin Blapp
@@ -5,91 +6,18 @@
# $FreeBSD$
#
-PORTNAME= staroffice
-PORTVERSION= 5.2
-CATEGORIES= editors linux
-MASTER_SITES= ftp://ftp.inf.utfsm.cl/pub/UTFSM/StarOffice_5.2/ \
- ftp://ftp.snerpa.is/pub/linux/ \
- ftp://ftp.osb.hu/pub/mirrors/staroffice/linux/ \
- ftp://ftp.uni-linz.ac.at/pub/staroffice_5.2/ \
- ftp://ftp.labyrinth.net.au/.5/kk/linux/star_office/ \
- ftp://ftp.acs.oakland.edu/files/Linux/StarOffice/office52/ \
- ftp://ftp.ctio.noao.edu/linux/ \
- ftp://sunsite.cnlab-switch.ch/mirror/staroffice/english/ \
- ftp://ftp.linux.tucows.com/pub/Linuxberg/ \
- ftp://ftp.jcu.edu.au/pub/StarOffice/ \
- ftp://ftp.uakom.sk/pub/mirrors/StarOffice/ \
- ftp://ftp.linux.hr/pub/staroffice/5.2/
-DISTNAME= so-5_2-ga-bin-linux-en.bin
-DISTFILES= soa-5_2-ga-bin-linux-en.bin so-5_2-ga-bin-linux-en.bin
-EXTRACT_ONLY=
+PORTNAME= openoffice
+PORTVERSION= 6.0.a605
+CATEGORIES= editors
+MASTER_SITES= http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
+DISTNAME= oo_605_src
-MAINTAINER= mb@imp.ch
+MAINTAINER= obrien@FreeBSD.org
-FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-
-ONLY_FOR_ARCHS= i386
-NO_CDROM= 'Must be downloaded direct from Sun via www interface'
-IS_INTERACTIVE= yes
-NO_BUILD= yes
-DIST_SUBDIR= staroffice52
-WRKSRC= ${WRKDIR}/office52
-TMPDIR= ${WRKDIR}/tmp
-LD_PATH= ${TMPDIR}:${WRKSRC}:${LINUXBASE}/lib:${LINUXBASE}/usr/lib
+CONFIGURE_WRKSRC= ${WRKSRC}/config_office
.include <bsd.port.pre.mk>
-pre-fetch:
-.if ${OSVERSION} < 410000
- @${ECHO}
- @${ECHO} OS-VERSION ${OSVERSION}
- @${ECHO}
- @${ECHO} Staroffice depends on a scripting fix for
- @${ECHO} /usr/src/sys/i386/linux/linux_sysvec.c
- @${ECHO} \(revision 1.55.2.1 or higher\)
- @${ECHO}
- @${ECHO} Please upgrade to FreeBSD 4.1
- @${ECHO}
- @${FALSE}
-.endif
-.if defined(WITH_CDROM)
-.if !exists(${CD_MOUNTPT}/linux/office52/setup)
- @${ECHO}
- @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
- @${ECHO} onto /cdrom and run make again.
- @${ECHO}
- @${FALSE}
-.endif
-.endif
-
-.if defined(WITH_CDROM)
-do-extract:
- @${MKDIR} ${WRKSRC}/office52
- @cd ${WRKSRC}/office52 && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
-.endif
-
-do-extract:
-.if !defined(DISPLAY) || ${DISPLAY} == ""
- @ ${ECHO}
- @ ${ECHO} Can\'t open display:
- @ ${ECHO} Please check your DISPLAY variable.
- @ ${ECHO}
- @ ${FALSE}
-.else
- @${MKDIR} ${WRKSRC}
- @${MKDIR} ${TMPDIR}
- @${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC}
- @${CP} ${_DISTDIR}/soa-5_2-ga-bin-linux-en.bin ${WRKSRC}
- @${CHMOD} 755 ${WRKSRC}/${DISTNAME}
- @${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
- @cd ${WRKSRC}
- @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
- @cd ../../
-.endif
-
-post-configure:
- @${PERL} -pi.orig -e 's|DefaultDestPath = "office52";|DefaultDestPath = "${PREFIX}/office52";|' ${WRKSRC}/setup.ins
-
do-install:
.if !defined(DISPLAY) || ${DISPLAY} == ""
@ ${ECHO}
diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo
index f1e7894f7587..bc002ffc38b1 100644
--- a/editors/openoffice-3-devel/distinfo
+++ b/editors/openoffice-3-devel/distinfo
@@ -1,2 +1 @@
-MD5 (staroffice52/soa-5_2-ga-bin-linux-en.bin) = 8f36a55d7cefd919febdefb502ae986d
-MD5 (staroffice52/so-5_2-ga-bin-linux-en.bin) = 1f03de10b6127772ba87567d334aeb4d
+MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
diff --git a/editors/openoffice-3-devel/files/patch-bootstrap.1 b/editors/openoffice-3-devel/files/patch-bootstrap.1
new file mode 100644
index 000000000000..fc625e321cca
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-bootstrap.1
@@ -0,0 +1,11 @@
+--- config_office/bootstrap.1.orig Mon Sep 18 09:13:24 2000
++++ config_office/bootstrap.1 Fri Oct 13 17:51:37 2000
+@@ -9,6 +9,8 @@
+ make linux
+ else if ($platform == "Darwin") then
+ make macosx
++else if ($platform == "FreeBSD") then
++ make linux
+ endif
+
+ if "$?" != "0" exit
diff --git a/editors/openoffice-3-devel/files/patch-configure b/editors/openoffice-3-devel/files/patch-configure
new file mode 100644
index 000000000000..744225fe9d31
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-configure
@@ -0,0 +1,11 @@
+--- config_office/configure.orig Thu Oct 12 02:34:03 2000
++++ config_office/configure Fri Oct 13 17:52:25 2000
+@@ -739,7 +739,7 @@
+ echo $ac_n "checking the operating system""... $ac_c" 1>&6
+ echo "configure:741: checking the operating system" >&5
+ _os=`uname`
+-if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin"; then
++if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin" -o "$_os" = "FreeBSD"; then
+ echo "$ac_t""checked ($_os)" 1>&6
+ else
+ { echo "configure: error: $_os operating system is not suitable to build OpenOffice!" 1>&2; exit 1; }
diff --git a/editors/openoffice-3-devel/files/patch-set_soenv.1 b/editors/openoffice-3-devel/files/patch-set_soenv.1
new file mode 100644
index 000000000000..d18d3038c06b
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-set_soenv.1
@@ -0,0 +1,218 @@
+--- config_office/set_soenv.1.orig Thu Oct 12 10:16:28 2000
++++ config_office/set_soenv.1 Sun Oct 15 23:12:53 2000
+@@ -11,7 +11,7 @@
+ # Description:
+ # set_soenv generates a file that contains all necessary
+ # environment variables for the build proces of OpenOffice
+-# on Linux, Solaris, Windows NT and Macosx.
++# on Linux, Solaris, FreeBSD, Windows NT and Macosx.
+ # This script prompts the installer to enter:
+ # 1. (if necessary) The directory where the jdk is located (JAVA_HOME).
+ # 2. (if necessary) The directory where the Microsoft C/C++ compiler is located (COMPATH).
+@@ -53,7 +53,7 @@
+ #--------------------------------------------------------
+ #
+ my ( $outfile, $bootfile, $newline, $comment, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,
+- $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $Winnt, $Macosx, $WScomp,
++ $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Freebsd, $Linux, $Winnt, $Macosx, $WScomp,
+ $GNUcomp, $platform, $machine_type, $empty, $no_jdk, $no_tcsh, $no_cl, $no_gcc, $no_gcc_home, $no_gcc_include,
+ $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $win_format_var);
+ #
+@@ -121,6 +121,7 @@
+ $L = " -L"; # library search path
+ $D = " -D"; # define search path
+ $Solaris = "SunOS"; # return of uname command on Solaris
++$Freebsd = "FreeBSD"; # return of uname command on FreeBSD
+ $Linux = "Linux"; # return of uname command on Linux
+ $Winnt = "WINNT"; # return of uname command on Windows NT
+ $Macosx = "Darwin"; # return of uname command on Macosx
+@@ -162,8 +163,8 @@
+ #
+ $platform = `uname`; # probing the platform
+ chomp( $platform );
+-if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) )
+-{ die "This script is only suitable for the Solaris, Linux, Windows NT or Macosx platform!\n";
++if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) ) && ( $platform ne $Freebsd )
++{ die "This script is only suitable for the Solaris, FreeBSD, Linux, Windows NT or Macosx platform!\n";
+ }
+ else
+ { if ( $platform eq $Solaris )
+@@ -254,6 +255,54 @@
+ $PROSWITCH = "-DPRODUCT";
+ $XPVERSION = "3";
+ }
++elsif ( $platform eq "$Freebsd" )
++{ if ($machine_type eq "i686")
++ { print "Setting FreeBSD Intel specific values... ";
++ $outfile = "LinuxIntelEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "I";
++ $CPUNAME = "INTEL";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngi3";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ else
++ { if ($machine_type eq "alpha")
++ { print "Setting FreeBSD/Alpha specific values... ";
++ $outfile = "FreeBSDAlphaEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "S";
++ $CPUNAME = "ALPHA";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngs";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ }
++}
+ elsif ( $platform eq "$Linux" )
+ { if ($machine_type eq "i686")
+ { print "Setting Linux Intel specific values... ";
+@@ -430,7 +479,7 @@
+ }
+ # 4. Gcc path.
+ # Check whether autoconf found the compiler path.
+-if ($platform eq $Linux)
++if ($platform eq $Linux) -o ($platform eq $Freebsd)
+ { if ( $ARGV[ 0 ] eq $no_gcc)
+ { AddWarning( "set_soenv", "Autoconf did not find correct gcc compiler, prompted for value" );
+ printf "Did you build gcc 2.95.2 from source using the --prefix and --enable-shared flags (y/n)?: ";
+@@ -643,6 +692,13 @@
+ $ps.$par_dir.$LIB.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $LD_LIBRARY_PATH = $cur_dir.
++ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
++ $ps.$USR_LOCAL.$LIB.
++ $ps.$par_dir.$LIB.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $LD_LIBRARY_PATH = $cur_dir.
+ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
+@@ -681,6 +737,21 @@
+ $D."PRODUCT".
+ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARDEF = '"'.$D."UNX".
++ $D.$COM.
++ $D.$CVER.
++ $D.$GVER.
++ $D."_PTHREADS".
++ $D.$OS.
++ $D.$CPUNAME.
++ $D."X86".
++ $D."_REENTRANT".
++ $D."_POSIX_PTHREAD_SEMANTICS".
++ $D."SUPD=$UPD".
++ $D."PRODUCT".
++ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARDEF = '"'.$D."UNX".
+ $D.$COM.
+@@ -707,6 +778,12 @@
+ $L.$USR_DT.$LIB.
+ $L.$USR_OPENWIN.$LIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
++ $L.$LIB.
++ $L.$USR.$LIB.
++ $L.$USR.$LOCAL.$LIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
+ $L.$LIB.
+@@ -721,6 +798,9 @@
+ if ($platform eq "$Solaris")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
+@@ -790,6 +870,20 @@
+ $ps.$USR_DT.$BIN.
+ $ps.$USR.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $PATH = $cur_dir.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
++ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
++ $ps.'$SOLARENV'.$BIN.
++ $ps.'$JAVA_HOME'.$BIN;
++
++ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
++
++ $PATH .= $ps.$USR.$ds."sbin".
++ $ps.$ETC.
++ $ps.$USR.$BIN.$ds."X11".
++ $ps.$USR.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $PATH = $cur_dir.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
+@@ -861,6 +955,17 @@
+ $L.'$JAVA_HOME'.$LIB.
+ $L.$XLIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARLIB = '"'.$L.$par_dir.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.$LIB.
++ $L.$USR_LIB.
++ $L.$USR_LOCAL.$LIB.
++ $L.'$JAVA_HOME'.$LIB.
++ $L.$XLIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARLIB = '"'.$L.$par_dir.$LIB.
+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+@@ -898,6 +1003,16 @@
+ $I.'$JAVA_HOME'.$INCLUDE.
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."solaris".
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".'"';
++}
++elsif ($platform eq "$Freebsd")
++{ $SOLARINC .= $I.$GXX_INCLUDE.
++ $I.'$SOLARENV'.$INC.$ds."Xp31".
++ $I.'$JAVA_HOME'.$INCLUDE.
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."linux".
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".
++ $I.$XINC.
++ $I.$GCC_INCLUDE.
++ $I.$USR.$INCLUDE.'"';
+ }
+ elsif ($platform eq "$Linux")
+ { $SOLARINC .= $I.$GXX_INCLUDE.
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index d510844e3a06..664b4dc13769 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -1,3 +1,4 @@
+# ex:ts=8
# New ports collection makefile for: StarOffice 5.2
# Date created: 22 August 2000
# Whom: Martin Blapp
@@ -5,91 +6,18 @@
# $FreeBSD$
#
-PORTNAME= staroffice
-PORTVERSION= 5.2
-CATEGORIES= editors linux
-MASTER_SITES= ftp://ftp.inf.utfsm.cl/pub/UTFSM/StarOffice_5.2/ \
- ftp://ftp.snerpa.is/pub/linux/ \
- ftp://ftp.osb.hu/pub/mirrors/staroffice/linux/ \
- ftp://ftp.uni-linz.ac.at/pub/staroffice_5.2/ \
- ftp://ftp.labyrinth.net.au/.5/kk/linux/star_office/ \
- ftp://ftp.acs.oakland.edu/files/Linux/StarOffice/office52/ \
- ftp://ftp.ctio.noao.edu/linux/ \
- ftp://sunsite.cnlab-switch.ch/mirror/staroffice/english/ \
- ftp://ftp.linux.tucows.com/pub/Linuxberg/ \
- ftp://ftp.jcu.edu.au/pub/StarOffice/ \
- ftp://ftp.uakom.sk/pub/mirrors/StarOffice/ \
- ftp://ftp.linux.hr/pub/staroffice/5.2/
-DISTNAME= so-5_2-ga-bin-linux-en.bin
-DISTFILES= soa-5_2-ga-bin-linux-en.bin so-5_2-ga-bin-linux-en.bin
-EXTRACT_ONLY=
+PORTNAME= openoffice
+PORTVERSION= 6.0.a605
+CATEGORIES= editors
+MASTER_SITES= http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
+DISTNAME= oo_605_src
-MAINTAINER= mb@imp.ch
+MAINTAINER= obrien@FreeBSD.org
-FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-
-ONLY_FOR_ARCHS= i386
-NO_CDROM= 'Must be downloaded direct from Sun via www interface'
-IS_INTERACTIVE= yes
-NO_BUILD= yes
-DIST_SUBDIR= staroffice52
-WRKSRC= ${WRKDIR}/office52
-TMPDIR= ${WRKDIR}/tmp
-LD_PATH= ${TMPDIR}:${WRKSRC}:${LINUXBASE}/lib:${LINUXBASE}/usr/lib
+CONFIGURE_WRKSRC= ${WRKSRC}/config_office
.include <bsd.port.pre.mk>
-pre-fetch:
-.if ${OSVERSION} < 410000
- @${ECHO}
- @${ECHO} OS-VERSION ${OSVERSION}
- @${ECHO}
- @${ECHO} Staroffice depends on a scripting fix for
- @${ECHO} /usr/src/sys/i386/linux/linux_sysvec.c
- @${ECHO} \(revision 1.55.2.1 or higher\)
- @${ECHO}
- @${ECHO} Please upgrade to FreeBSD 4.1
- @${ECHO}
- @${FALSE}
-.endif
-.if defined(WITH_CDROM)
-.if !exists(${CD_MOUNTPT}/linux/office52/setup)
- @${ECHO}
- @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
- @${ECHO} onto /cdrom and run make again.
- @${ECHO}
- @${FALSE}
-.endif
-.endif
-
-.if defined(WITH_CDROM)
-do-extract:
- @${MKDIR} ${WRKSRC}/office52
- @cd ${WRKSRC}/office52 && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
-.endif
-
-do-extract:
-.if !defined(DISPLAY) || ${DISPLAY} == ""
- @ ${ECHO}
- @ ${ECHO} Can\'t open display:
- @ ${ECHO} Please check your DISPLAY variable.
- @ ${ECHO}
- @ ${FALSE}
-.else
- @${MKDIR} ${WRKSRC}
- @${MKDIR} ${TMPDIR}
- @${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC}
- @${CP} ${_DISTDIR}/soa-5_2-ga-bin-linux-en.bin ${WRKSRC}
- @${CHMOD} 755 ${WRKSRC}/${DISTNAME}
- @${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
- @cd ${WRKSRC}
- @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
- @cd ../../
-.endif
-
-post-configure:
- @${PERL} -pi.orig -e 's|DefaultDestPath = "office52";|DefaultDestPath = "${PREFIX}/office52";|' ${WRKSRC}/setup.ins
-
do-install:
.if !defined(DISPLAY) || ${DISPLAY} == ""
@ ${ECHO}
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index f1e7894f7587..bc002ffc38b1 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,2 +1 @@
-MD5 (staroffice52/soa-5_2-ga-bin-linux-en.bin) = 8f36a55d7cefd919febdefb502ae986d
-MD5 (staroffice52/so-5_2-ga-bin-linux-en.bin) = 1f03de10b6127772ba87567d334aeb4d
+MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
diff --git a/editors/openoffice-3/files/patch-bootstrap.1 b/editors/openoffice-3/files/patch-bootstrap.1
new file mode 100644
index 000000000000..fc625e321cca
--- /dev/null
+++ b/editors/openoffice-3/files/patch-bootstrap.1
@@ -0,0 +1,11 @@
+--- config_office/bootstrap.1.orig Mon Sep 18 09:13:24 2000
++++ config_office/bootstrap.1 Fri Oct 13 17:51:37 2000
+@@ -9,6 +9,8 @@
+ make linux
+ else if ($platform == "Darwin") then
+ make macosx
++else if ($platform == "FreeBSD") then
++ make linux
+ endif
+
+ if "$?" != "0" exit
diff --git a/editors/openoffice-3/files/patch-configure b/editors/openoffice-3/files/patch-configure
new file mode 100644
index 000000000000..744225fe9d31
--- /dev/null
+++ b/editors/openoffice-3/files/patch-configure
@@ -0,0 +1,11 @@
+--- config_office/configure.orig Thu Oct 12 02:34:03 2000
++++ config_office/configure Fri Oct 13 17:52:25 2000
+@@ -739,7 +739,7 @@
+ echo $ac_n "checking the operating system""... $ac_c" 1>&6
+ echo "configure:741: checking the operating system" >&5
+ _os=`uname`
+-if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin"; then
++if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin" -o "$_os" = "FreeBSD"; then
+ echo "$ac_t""checked ($_os)" 1>&6
+ else
+ { echo "configure: error: $_os operating system is not suitable to build OpenOffice!" 1>&2; exit 1; }
diff --git a/editors/openoffice-3/files/patch-set_soenv.1 b/editors/openoffice-3/files/patch-set_soenv.1
new file mode 100644
index 000000000000..d18d3038c06b
--- /dev/null
+++ b/editors/openoffice-3/files/patch-set_soenv.1
@@ -0,0 +1,218 @@
+--- config_office/set_soenv.1.orig Thu Oct 12 10:16:28 2000
++++ config_office/set_soenv.1 Sun Oct 15 23:12:53 2000
+@@ -11,7 +11,7 @@
+ # Description:
+ # set_soenv generates a file that contains all necessary
+ # environment variables for the build proces of OpenOffice
+-# on Linux, Solaris, Windows NT and Macosx.
++# on Linux, Solaris, FreeBSD, Windows NT and Macosx.
+ # This script prompts the installer to enter:
+ # 1. (if necessary) The directory where the jdk is located (JAVA_HOME).
+ # 2. (if necessary) The directory where the Microsoft C/C++ compiler is located (COMPATH).
+@@ -53,7 +53,7 @@
+ #--------------------------------------------------------
+ #
+ my ( $outfile, $bootfile, $newline, $comment, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,
+- $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $Winnt, $Macosx, $WScomp,
++ $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Freebsd, $Linux, $Winnt, $Macosx, $WScomp,
+ $GNUcomp, $platform, $machine_type, $empty, $no_jdk, $no_tcsh, $no_cl, $no_gcc, $no_gcc_home, $no_gcc_include,
+ $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $win_format_var);
+ #
+@@ -121,6 +121,7 @@
+ $L = " -L"; # library search path
+ $D = " -D"; # define search path
+ $Solaris = "SunOS"; # return of uname command on Solaris
++$Freebsd = "FreeBSD"; # return of uname command on FreeBSD
+ $Linux = "Linux"; # return of uname command on Linux
+ $Winnt = "WINNT"; # return of uname command on Windows NT
+ $Macosx = "Darwin"; # return of uname command on Macosx
+@@ -162,8 +163,8 @@
+ #
+ $platform = `uname`; # probing the platform
+ chomp( $platform );
+-if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) )
+-{ die "This script is only suitable for the Solaris, Linux, Windows NT or Macosx platform!\n";
++if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) ) && ( $platform ne $Freebsd )
++{ die "This script is only suitable for the Solaris, FreeBSD, Linux, Windows NT or Macosx platform!\n";
+ }
+ else
+ { if ( $platform eq $Solaris )
+@@ -254,6 +255,54 @@
+ $PROSWITCH = "-DPRODUCT";
+ $XPVERSION = "3";
+ }
++elsif ( $platform eq "$Freebsd" )
++{ if ($machine_type eq "i686")
++ { print "Setting FreeBSD Intel specific values... ";
++ $outfile = "LinuxIntelEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "I";
++ $CPUNAME = "INTEL";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngi3";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ else
++ { if ($machine_type eq "alpha")
++ { print "Setting FreeBSD/Alpha specific values... ";
++ $outfile = "FreeBSDAlphaEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "S";
++ $CPUNAME = "ALPHA";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngs";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ }
++}
+ elsif ( $platform eq "$Linux" )
+ { if ($machine_type eq "i686")
+ { print "Setting Linux Intel specific values... ";
+@@ -430,7 +479,7 @@
+ }
+ # 4. Gcc path.
+ # Check whether autoconf found the compiler path.
+-if ($platform eq $Linux)
++if ($platform eq $Linux) -o ($platform eq $Freebsd)
+ { if ( $ARGV[ 0 ] eq $no_gcc)
+ { AddWarning( "set_soenv", "Autoconf did not find correct gcc compiler, prompted for value" );
+ printf "Did you build gcc 2.95.2 from source using the --prefix and --enable-shared flags (y/n)?: ";
+@@ -643,6 +692,13 @@
+ $ps.$par_dir.$LIB.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $LD_LIBRARY_PATH = $cur_dir.
++ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
++ $ps.$USR_LOCAL.$LIB.
++ $ps.$par_dir.$LIB.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $LD_LIBRARY_PATH = $cur_dir.
+ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
+@@ -681,6 +737,21 @@
+ $D."PRODUCT".
+ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARDEF = '"'.$D."UNX".
++ $D.$COM.
++ $D.$CVER.
++ $D.$GVER.
++ $D."_PTHREADS".
++ $D.$OS.
++ $D.$CPUNAME.
++ $D."X86".
++ $D."_REENTRANT".
++ $D."_POSIX_PTHREAD_SEMANTICS".
++ $D."SUPD=$UPD".
++ $D."PRODUCT".
++ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARDEF = '"'.$D."UNX".
+ $D.$COM.
+@@ -707,6 +778,12 @@
+ $L.$USR_DT.$LIB.
+ $L.$USR_OPENWIN.$LIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
++ $L.$LIB.
++ $L.$USR.$LIB.
++ $L.$USR.$LOCAL.$LIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
+ $L.$LIB.
+@@ -721,6 +798,9 @@
+ if ($platform eq "$Solaris")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
+@@ -790,6 +870,20 @@
+ $ps.$USR_DT.$BIN.
+ $ps.$USR.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $PATH = $cur_dir.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
++ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
++ $ps.'$SOLARENV'.$BIN.
++ $ps.'$JAVA_HOME'.$BIN;
++
++ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
++
++ $PATH .= $ps.$USR.$ds."sbin".
++ $ps.$ETC.
++ $ps.$USR.$BIN.$ds."X11".
++ $ps.$USR.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $PATH = $cur_dir.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
+@@ -861,6 +955,17 @@
+ $L.'$JAVA_HOME'.$LIB.
+ $L.$XLIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARLIB = '"'.$L.$par_dir.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.$LIB.
++ $L.$USR_LIB.
++ $L.$USR_LOCAL.$LIB.
++ $L.'$JAVA_HOME'.$LIB.
++ $L.$XLIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARLIB = '"'.$L.$par_dir.$LIB.
+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+@@ -898,6 +1003,16 @@
+ $I.'$JAVA_HOME'.$INCLUDE.
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."solaris".
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".'"';
++}
++elsif ($platform eq "$Freebsd")
++{ $SOLARINC .= $I.$GXX_INCLUDE.
++ $I.'$SOLARENV'.$INC.$ds."Xp31".
++ $I.'$JAVA_HOME'.$INCLUDE.
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."linux".
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".
++ $I.$XINC.
++ $I.$GCC_INCLUDE.
++ $I.$USR.$INCLUDE.'"';
+ }
+ elsif ($platform eq "$Linux")
+ { $SOLARINC .= $I.$GXX_INCLUDE.
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index d510844e3a06..664b4dc13769 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -1,3 +1,4 @@
+# ex:ts=8
# New ports collection makefile for: StarOffice 5.2
# Date created: 22 August 2000
# Whom: Martin Blapp
@@ -5,91 +6,18 @@
# $FreeBSD$
#
-PORTNAME= staroffice
-PORTVERSION= 5.2
-CATEGORIES= editors linux
-MASTER_SITES= ftp://ftp.inf.utfsm.cl/pub/UTFSM/StarOffice_5.2/ \
- ftp://ftp.snerpa.is/pub/linux/ \
- ftp://ftp.osb.hu/pub/mirrors/staroffice/linux/ \
- ftp://ftp.uni-linz.ac.at/pub/staroffice_5.2/ \
- ftp://ftp.labyrinth.net.au/.5/kk/linux/star_office/ \
- ftp://ftp.acs.oakland.edu/files/Linux/StarOffice/office52/ \
- ftp://ftp.ctio.noao.edu/linux/ \
- ftp://sunsite.cnlab-switch.ch/mirror/staroffice/english/ \
- ftp://ftp.linux.tucows.com/pub/Linuxberg/ \
- ftp://ftp.jcu.edu.au/pub/StarOffice/ \
- ftp://ftp.uakom.sk/pub/mirrors/StarOffice/ \
- ftp://ftp.linux.hr/pub/staroffice/5.2/
-DISTNAME= so-5_2-ga-bin-linux-en.bin
-DISTFILES= soa-5_2-ga-bin-linux-en.bin so-5_2-ga-bin-linux-en.bin
-EXTRACT_ONLY=
+PORTNAME= openoffice
+PORTVERSION= 6.0.a605
+CATEGORIES= editors
+MASTER_SITES= http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
+DISTNAME= oo_605_src
-MAINTAINER= mb@imp.ch
+MAINTAINER= obrien@FreeBSD.org
-FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-
-ONLY_FOR_ARCHS= i386
-NO_CDROM= 'Must be downloaded direct from Sun via www interface'
-IS_INTERACTIVE= yes
-NO_BUILD= yes
-DIST_SUBDIR= staroffice52
-WRKSRC= ${WRKDIR}/office52
-TMPDIR= ${WRKDIR}/tmp
-LD_PATH= ${TMPDIR}:${WRKSRC}:${LINUXBASE}/lib:${LINUXBASE}/usr/lib
+CONFIGURE_WRKSRC= ${WRKSRC}/config_office
.include <bsd.port.pre.mk>
-pre-fetch:
-.if ${OSVERSION} < 410000
- @${ECHO}
- @${ECHO} OS-VERSION ${OSVERSION}
- @${ECHO}
- @${ECHO} Staroffice depends on a scripting fix for
- @${ECHO} /usr/src/sys/i386/linux/linux_sysvec.c
- @${ECHO} \(revision 1.55.2.1 or higher\)
- @${ECHO}
- @${ECHO} Please upgrade to FreeBSD 4.1
- @${ECHO}
- @${FALSE}
-.endif
-.if defined(WITH_CDROM)
-.if !exists(${CD_MOUNTPT}/linux/office52/setup)
- @${ECHO}
- @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
- @${ECHO} onto /cdrom and run make again.
- @${ECHO}
- @${FALSE}
-.endif
-.endif
-
-.if defined(WITH_CDROM)
-do-extract:
- @${MKDIR} ${WRKSRC}/office52
- @cd ${WRKSRC}/office52 && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
-.endif
-
-do-extract:
-.if !defined(DISPLAY) || ${DISPLAY} == ""
- @ ${ECHO}
- @ ${ECHO} Can\'t open display:
- @ ${ECHO} Please check your DISPLAY variable.
- @ ${ECHO}
- @ ${FALSE}
-.else
- @${MKDIR} ${WRKSRC}
- @${MKDIR} ${TMPDIR}
- @${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC}
- @${CP} ${_DISTDIR}/soa-5_2-ga-bin-linux-en.bin ${WRKSRC}
- @${CHMOD} 755 ${WRKSRC}/${DISTNAME}
- @${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
- @cd ${WRKSRC}
- @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
- @cd ../../
-.endif
-
-post-configure:
- @${PERL} -pi.orig -e 's|DefaultDestPath = "office52";|DefaultDestPath = "${PREFIX}/office52";|' ${WRKSRC}/setup.ins
-
do-install:
.if !defined(DISPLAY) || ${DISPLAY} == ""
@ ${ECHO}
diff --git a/editors/openoffice-devel/distinfo b/editors/openoffice-devel/distinfo
index f1e7894f7587..bc002ffc38b1 100644
--- a/editors/openoffice-devel/distinfo
+++ b/editors/openoffice-devel/distinfo
@@ -1,2 +1 @@
-MD5 (staroffice52/soa-5_2-ga-bin-linux-en.bin) = 8f36a55d7cefd919febdefb502ae986d
-MD5 (staroffice52/so-5_2-ga-bin-linux-en.bin) = 1f03de10b6127772ba87567d334aeb4d
+MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
diff --git a/editors/openoffice-devel/files/patch-bootstrap.1 b/editors/openoffice-devel/files/patch-bootstrap.1
new file mode 100644
index 000000000000..fc625e321cca
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-bootstrap.1
@@ -0,0 +1,11 @@
+--- config_office/bootstrap.1.orig Mon Sep 18 09:13:24 2000
++++ config_office/bootstrap.1 Fri Oct 13 17:51:37 2000
+@@ -9,6 +9,8 @@
+ make linux
+ else if ($platform == "Darwin") then
+ make macosx
++else if ($platform == "FreeBSD") then
++ make linux
+ endif
+
+ if "$?" != "0" exit
diff --git a/editors/openoffice-devel/files/patch-configure b/editors/openoffice-devel/files/patch-configure
new file mode 100644
index 000000000000..744225fe9d31
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-configure
@@ -0,0 +1,11 @@
+--- config_office/configure.orig Thu Oct 12 02:34:03 2000
++++ config_office/configure Fri Oct 13 17:52:25 2000
+@@ -739,7 +739,7 @@
+ echo $ac_n "checking the operating system""... $ac_c" 1>&6
+ echo "configure:741: checking the operating system" >&5
+ _os=`uname`
+-if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin"; then
++if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin" -o "$_os" = "FreeBSD"; then
+ echo "$ac_t""checked ($_os)" 1>&6
+ else
+ { echo "configure: error: $_os operating system is not suitable to build OpenOffice!" 1>&2; exit 1; }
diff --git a/editors/openoffice-devel/files/patch-set_soenv.1 b/editors/openoffice-devel/files/patch-set_soenv.1
new file mode 100644
index 000000000000..d18d3038c06b
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-set_soenv.1
@@ -0,0 +1,218 @@
+--- config_office/set_soenv.1.orig Thu Oct 12 10:16:28 2000
++++ config_office/set_soenv.1 Sun Oct 15 23:12:53 2000
+@@ -11,7 +11,7 @@
+ # Description:
+ # set_soenv generates a file that contains all necessary
+ # environment variables for the build proces of OpenOffice
+-# on Linux, Solaris, Windows NT and Macosx.
++# on Linux, Solaris, FreeBSD, Windows NT and Macosx.
+ # This script prompts the installer to enter:
+ # 1. (if necessary) The directory where the jdk is located (JAVA_HOME).
+ # 2. (if necessary) The directory where the Microsoft C/C++ compiler is located (COMPATH).
+@@ -53,7 +53,7 @@
+ #--------------------------------------------------------
+ #
+ my ( $outfile, $bootfile, $newline, $comment, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,
+- $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $Winnt, $Macosx, $WScomp,
++ $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Freebsd, $Linux, $Winnt, $Macosx, $WScomp,
+ $GNUcomp, $platform, $machine_type, $empty, $no_jdk, $no_tcsh, $no_cl, $no_gcc, $no_gcc_home, $no_gcc_include,
+ $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $win_format_var);
+ #
+@@ -121,6 +121,7 @@
+ $L = " -L"; # library search path
+ $D = " -D"; # define search path
+ $Solaris = "SunOS"; # return of uname command on Solaris
++$Freebsd = "FreeBSD"; # return of uname command on FreeBSD
+ $Linux = "Linux"; # return of uname command on Linux
+ $Winnt = "WINNT"; # return of uname command on Windows NT
+ $Macosx = "Darwin"; # return of uname command on Macosx
+@@ -162,8 +163,8 @@
+ #
+ $platform = `uname`; # probing the platform
+ chomp( $platform );
+-if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) )
+-{ die "This script is only suitable for the Solaris, Linux, Windows NT or Macosx platform!\n";
++if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) ) && ( $platform ne $Freebsd )
++{ die "This script is only suitable for the Solaris, FreeBSD, Linux, Windows NT or Macosx platform!\n";
+ }
+ else
+ { if ( $platform eq $Solaris )
+@@ -254,6 +255,54 @@
+ $PROSWITCH = "-DPRODUCT";
+ $XPVERSION = "3";
+ }
++elsif ( $platform eq "$Freebsd" )
++{ if ($machine_type eq "i686")
++ { print "Setting FreeBSD Intel specific values... ";
++ $outfile = "LinuxIntelEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "I";
++ $CPUNAME = "INTEL";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngi3";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ else
++ { if ($machine_type eq "alpha")
++ { print "Setting FreeBSD/Alpha specific values... ";
++ $outfile = "FreeBSDAlphaEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "S";
++ $CPUNAME = "ALPHA";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngs";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ }
++}
+ elsif ( $platform eq "$Linux" )
+ { if ($machine_type eq "i686")
+ { print "Setting Linux Intel specific values... ";
+@@ -430,7 +479,7 @@
+ }
+ # 4. Gcc path.
+ # Check whether autoconf found the compiler path.
+-if ($platform eq $Linux)
++if ($platform eq $Linux) -o ($platform eq $Freebsd)
+ { if ( $ARGV[ 0 ] eq $no_gcc)
+ { AddWarning( "set_soenv", "Autoconf did not find correct gcc compiler, prompted for value" );
+ printf "Did you build gcc 2.95.2 from source using the --prefix and --enable-shared flags (y/n)?: ";
+@@ -643,6 +692,13 @@
+ $ps.$par_dir.$LIB.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $LD_LIBRARY_PATH = $cur_dir.
++ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
++ $ps.$USR_LOCAL.$LIB.
++ $ps.$par_dir.$LIB.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $LD_LIBRARY_PATH = $cur_dir.
+ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
+@@ -681,6 +737,21 @@
+ $D."PRODUCT".
+ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARDEF = '"'.$D."UNX".
++ $D.$COM.
++ $D.$CVER.
++ $D.$GVER.
++ $D."_PTHREADS".
++ $D.$OS.
++ $D.$CPUNAME.
++ $D."X86".
++ $D."_REENTRANT".
++ $D."_POSIX_PTHREAD_SEMANTICS".
++ $D."SUPD=$UPD".
++ $D."PRODUCT".
++ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARDEF = '"'.$D."UNX".
+ $D.$COM.
+@@ -707,6 +778,12 @@
+ $L.$USR_DT.$LIB.
+ $L.$USR_OPENWIN.$LIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
++ $L.$LIB.
++ $L.$USR.$LIB.
++ $L.$USR.$LOCAL.$LIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
+ $L.$LIB.
+@@ -721,6 +798,9 @@
+ if ($platform eq "$Solaris")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
+@@ -790,6 +870,20 @@
+ $ps.$USR_DT.$BIN.
+ $ps.$USR.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $PATH = $cur_dir.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
++ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
++ $ps.'$SOLARENV'.$BIN.
++ $ps.'$JAVA_HOME'.$BIN;
++
++ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
++
++ $PATH .= $ps.$USR.$ds."sbin".
++ $ps.$ETC.
++ $ps.$USR.$BIN.$ds."X11".
++ $ps.$USR.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $PATH = $cur_dir.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
+@@ -861,6 +955,17 @@
+ $L.'$JAVA_HOME'.$LIB.
+ $L.$XLIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARLIB = '"'.$L.$par_dir.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.$LIB.
++ $L.$USR_LIB.
++ $L.$USR_LOCAL.$LIB.
++ $L.'$JAVA_HOME'.$LIB.
++ $L.$XLIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARLIB = '"'.$L.$par_dir.$LIB.
+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+@@ -898,6 +1003,16 @@
+ $I.'$JAVA_HOME'.$INCLUDE.
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."solaris".
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".'"';
++}
++elsif ($platform eq "$Freebsd")
++{ $SOLARINC .= $I.$GXX_INCLUDE.
++ $I.'$SOLARENV'.$INC.$ds."Xp31".
++ $I.'$JAVA_HOME'.$INCLUDE.
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."linux".
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".
++ $I.$XINC.
++ $I.$GCC_INCLUDE.
++ $I.$USR.$INCLUDE.'"';
+ }
+ elsif ($platform eq "$Linux")
+ { $SOLARINC .= $I.$GXX_INCLUDE.
diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile
index d510844e3a06..664b4dc13769 100644
--- a/editors/openoffice.org-1.0/Makefile
+++ b/editors/openoffice.org-1.0/Makefile
@@ -1,3 +1,4 @@
+# ex:ts=8
# New ports collection makefile for: StarOffice 5.2
# Date created: 22 August 2000
# Whom: Martin Blapp
@@ -5,91 +6,18 @@
# $FreeBSD$
#
-PORTNAME= staroffice
-PORTVERSION= 5.2
-CATEGORIES= editors linux
-MASTER_SITES= ftp://ftp.inf.utfsm.cl/pub/UTFSM/StarOffice_5.2/ \
- ftp://ftp.snerpa.is/pub/linux/ \
- ftp://ftp.osb.hu/pub/mirrors/staroffice/linux/ \
- ftp://ftp.uni-linz.ac.at/pub/staroffice_5.2/ \
- ftp://ftp.labyrinth.net.au/.5/kk/linux/star_office/ \
- ftp://ftp.acs.oakland.edu/files/Linux/StarOffice/office52/ \
- ftp://ftp.ctio.noao.edu/linux/ \
- ftp://sunsite.cnlab-switch.ch/mirror/staroffice/english/ \
- ftp://ftp.linux.tucows.com/pub/Linuxberg/ \
- ftp://ftp.jcu.edu.au/pub/StarOffice/ \
- ftp://ftp.uakom.sk/pub/mirrors/StarOffice/ \
- ftp://ftp.linux.hr/pub/staroffice/5.2/
-DISTNAME= so-5_2-ga-bin-linux-en.bin
-DISTFILES= soa-5_2-ga-bin-linux-en.bin so-5_2-ga-bin-linux-en.bin
-EXTRACT_ONLY=
+PORTNAME= openoffice
+PORTVERSION= 6.0.a605
+CATEGORIES= editors
+MASTER_SITES= http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
+DISTNAME= oo_605_src
-MAINTAINER= mb@imp.ch
+MAINTAINER= obrien@FreeBSD.org
-FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-
-ONLY_FOR_ARCHS= i386
-NO_CDROM= 'Must be downloaded direct from Sun via www interface'
-IS_INTERACTIVE= yes
-NO_BUILD= yes
-DIST_SUBDIR= staroffice52
-WRKSRC= ${WRKDIR}/office52
-TMPDIR= ${WRKDIR}/tmp
-LD_PATH= ${TMPDIR}:${WRKSRC}:${LINUXBASE}/lib:${LINUXBASE}/usr/lib
+CONFIGURE_WRKSRC= ${WRKSRC}/config_office
.include <bsd.port.pre.mk>
-pre-fetch:
-.if ${OSVERSION} < 410000
- @${ECHO}
- @${ECHO} OS-VERSION ${OSVERSION}
- @${ECHO}
- @${ECHO} Staroffice depends on a scripting fix for
- @${ECHO} /usr/src/sys/i386/linux/linux_sysvec.c
- @${ECHO} \(revision 1.55.2.1 or higher\)
- @${ECHO}
- @${ECHO} Please upgrade to FreeBSD 4.1
- @${ECHO}
- @${FALSE}
-.endif
-.if defined(WITH_CDROM)
-.if !exists(${CD_MOUNTPT}/linux/office52/setup)
- @${ECHO}
- @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
- @${ECHO} onto /cdrom and run make again.
- @${ECHO}
- @${FALSE}
-.endif
-.endif
-
-.if defined(WITH_CDROM)
-do-extract:
- @${MKDIR} ${WRKSRC}/office52
- @cd ${WRKSRC}/office52 && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
-.endif
-
-do-extract:
-.if !defined(DISPLAY) || ${DISPLAY} == ""
- @ ${ECHO}
- @ ${ECHO} Can\'t open display:
- @ ${ECHO} Please check your DISPLAY variable.
- @ ${ECHO}
- @ ${FALSE}
-.else
- @${MKDIR} ${WRKSRC}
- @${MKDIR} ${TMPDIR}
- @${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC}
- @${CP} ${_DISTDIR}/soa-5_2-ga-bin-linux-en.bin ${WRKSRC}
- @${CHMOD} 755 ${WRKSRC}/${DISTNAME}
- @${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
- @cd ${WRKSRC}
- @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
- @cd ../../
-.endif
-
-post-configure:
- @${PERL} -pi.orig -e 's|DefaultDestPath = "office52";|DefaultDestPath = "${PREFIX}/office52";|' ${WRKSRC}/setup.ins
-
do-install:
.if !defined(DISPLAY) || ${DISPLAY} == ""
@ ${ECHO}
diff --git a/editors/openoffice.org-1.0/distinfo b/editors/openoffice.org-1.0/distinfo
index f1e7894f7587..bc002ffc38b1 100644
--- a/editors/openoffice.org-1.0/distinfo
+++ b/editors/openoffice.org-1.0/distinfo
@@ -1,2 +1 @@
-MD5 (staroffice52/soa-5_2-ga-bin-linux-en.bin) = 8f36a55d7cefd919febdefb502ae986d
-MD5 (staroffice52/so-5_2-ga-bin-linux-en.bin) = 1f03de10b6127772ba87567d334aeb4d
+MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
diff --git a/editors/openoffice.org-1.0/files/patch-bootstrap.1 b/editors/openoffice.org-1.0/files/patch-bootstrap.1
new file mode 100644
index 000000000000..fc625e321cca
--- /dev/null
+++ b/editors/openoffice.org-1.0/files/patch-bootstrap.1
@@ -0,0 +1,11 @@
+--- config_office/bootstrap.1.orig Mon Sep 18 09:13:24 2000
++++ config_office/bootstrap.1 Fri Oct 13 17:51:37 2000
+@@ -9,6 +9,8 @@
+ make linux
+ else if ($platform == "Darwin") then
+ make macosx
++else if ($platform == "FreeBSD") then
++ make linux
+ endif
+
+ if "$?" != "0" exit
diff --git a/editors/openoffice.org-1.0/files/patch-config_office+set_soenv.1 b/editors/openoffice.org-1.0/files/patch-config_office+set_soenv.1
new file mode 100644
index 000000000000..d18d3038c06b
--- /dev/null
+++ b/editors/openoffice.org-1.0/files/patch-config_office+set_soenv.1
@@ -0,0 +1,218 @@
+--- config_office/set_soenv.1.orig Thu Oct 12 10:16:28 2000
++++ config_office/set_soenv.1 Sun Oct 15 23:12:53 2000
+@@ -11,7 +11,7 @@
+ # Description:
+ # set_soenv generates a file that contains all necessary
+ # environment variables for the build proces of OpenOffice
+-# on Linux, Solaris, Windows NT and Macosx.
++# on Linux, Solaris, FreeBSD, Windows NT and Macosx.
+ # This script prompts the installer to enter:
+ # 1. (if necessary) The directory where the jdk is located (JAVA_HOME).
+ # 2. (if necessary) The directory where the Microsoft C/C++ compiler is located (COMPATH).
+@@ -53,7 +53,7 @@
+ #--------------------------------------------------------
+ #
+ my ( $outfile, $bootfile, $newline, $comment, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,
+- $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $Winnt, $Macosx, $WScomp,
++ $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Freebsd, $Linux, $Winnt, $Macosx, $WScomp,
+ $GNUcomp, $platform, $machine_type, $empty, $no_jdk, $no_tcsh, $no_cl, $no_gcc, $no_gcc_home, $no_gcc_include,
+ $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $win_format_var);
+ #
+@@ -121,6 +121,7 @@
+ $L = " -L"; # library search path
+ $D = " -D"; # define search path
+ $Solaris = "SunOS"; # return of uname command on Solaris
++$Freebsd = "FreeBSD"; # return of uname command on FreeBSD
+ $Linux = "Linux"; # return of uname command on Linux
+ $Winnt = "WINNT"; # return of uname command on Windows NT
+ $Macosx = "Darwin"; # return of uname command on Macosx
+@@ -162,8 +163,8 @@
+ #
+ $platform = `uname`; # probing the platform
+ chomp( $platform );
+-if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) )
+-{ die "This script is only suitable for the Solaris, Linux, Windows NT or Macosx platform!\n";
++if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) ) && ( $platform ne $Freebsd )
++{ die "This script is only suitable for the Solaris, FreeBSD, Linux, Windows NT or Macosx platform!\n";
+ }
+ else
+ { if ( $platform eq $Solaris )
+@@ -254,6 +255,54 @@
+ $PROSWITCH = "-DPRODUCT";
+ $XPVERSION = "3";
+ }
++elsif ( $platform eq "$Freebsd" )
++{ if ($machine_type eq "i686")
++ { print "Setting FreeBSD Intel specific values... ";
++ $outfile = "LinuxIntelEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "I";
++ $CPUNAME = "INTEL";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngi3";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ else
++ { if ($machine_type eq "alpha")
++ { print "Setting FreeBSD/Alpha specific values... ";
++ $outfile = "FreeBSDAlphaEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "S";
++ $CPUNAME = "ALPHA";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngs";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ }
++}
+ elsif ( $platform eq "$Linux" )
+ { if ($machine_type eq "i686")
+ { print "Setting Linux Intel specific values... ";
+@@ -430,7 +479,7 @@
+ }
+ # 4. Gcc path.
+ # Check whether autoconf found the compiler path.
+-if ($platform eq $Linux)
++if ($platform eq $Linux) -o ($platform eq $Freebsd)
+ { if ( $ARGV[ 0 ] eq $no_gcc)
+ { AddWarning( "set_soenv", "Autoconf did not find correct gcc compiler, prompted for value" );
+ printf "Did you build gcc 2.95.2 from source using the --prefix and --enable-shared flags (y/n)?: ";
+@@ -643,6 +692,13 @@
+ $ps.$par_dir.$LIB.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $LD_LIBRARY_PATH = $cur_dir.
++ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
++ $ps.$USR_LOCAL.$LIB.
++ $ps.$par_dir.$LIB.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $LD_LIBRARY_PATH = $cur_dir.
+ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
+@@ -681,6 +737,21 @@
+ $D."PRODUCT".
+ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARDEF = '"'.$D."UNX".
++ $D.$COM.
++ $D.$CVER.
++ $D.$GVER.
++ $D."_PTHREADS".
++ $D.$OS.
++ $D.$CPUNAME.
++ $D."X86".
++ $D."_REENTRANT".
++ $D."_POSIX_PTHREAD_SEMANTICS".
++ $D."SUPD=$UPD".
++ $D."PRODUCT".
++ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARDEF = '"'.$D."UNX".
+ $D.$COM.
+@@ -707,6 +778,12 @@
+ $L.$USR_DT.$LIB.
+ $L.$USR_OPENWIN.$LIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
++ $L.$LIB.
++ $L.$USR.$LIB.
++ $L.$USR.$LOCAL.$LIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
+ $L.$LIB.
+@@ -721,6 +798,9 @@
+ if ($platform eq "$Solaris")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
+@@ -790,6 +870,20 @@
+ $ps.$USR_DT.$BIN.
+ $ps.$USR.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $PATH = $cur_dir.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
++ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
++ $ps.'$SOLARENV'.$BIN.
++ $ps.'$JAVA_HOME'.$BIN;
++
++ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
++
++ $PATH .= $ps.$USR.$ds."sbin".
++ $ps.$ETC.
++ $ps.$USR.$BIN.$ds."X11".
++ $ps.$USR.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $PATH = $cur_dir.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
+@@ -861,6 +955,17 @@
+ $L.'$JAVA_HOME'.$LIB.
+ $L.$XLIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARLIB = '"'.$L.$par_dir.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.$LIB.
++ $L.$USR_LIB.
++ $L.$USR_LOCAL.$LIB.
++ $L.'$JAVA_HOME'.$LIB.
++ $L.$XLIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARLIB = '"'.$L.$par_dir.$LIB.
+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+@@ -898,6 +1003,16 @@
+ $I.'$JAVA_HOME'.$INCLUDE.
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."solaris".
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".'"';
++}
++elsif ($platform eq "$Freebsd")
++{ $SOLARINC .= $I.$GXX_INCLUDE.
++ $I.'$SOLARENV'.$INC.$ds."Xp31".
++ $I.'$JAVA_HOME'.$INCLUDE.
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."linux".
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".
++ $I.$XINC.
++ $I.$GCC_INCLUDE.
++ $I.$USR.$INCLUDE.'"';
+ }
+ elsif ($platform eq "$Linux")
+ { $SOLARINC .= $I.$GXX_INCLUDE.
diff --git a/editors/openoffice.org-1.0/files/patch-configure b/editors/openoffice.org-1.0/files/patch-configure
new file mode 100644
index 000000000000..744225fe9d31
--- /dev/null
+++ b/editors/openoffice.org-1.0/files/patch-configure
@@ -0,0 +1,11 @@
+--- config_office/configure.orig Thu Oct 12 02:34:03 2000
++++ config_office/configure Fri Oct 13 17:52:25 2000
+@@ -739,7 +739,7 @@
+ echo $ac_n "checking the operating system""... $ac_c" 1>&6
+ echo "configure:741: checking the operating system" >&5
+ _os=`uname`
+-if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin"; then
++if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin" -o "$_os" = "FreeBSD"; then
+ echo "$ac_t""checked ($_os)" 1>&6
+ else
+ { echo "configure: error: $_os operating system is not suitable to build OpenOffice!" 1>&2; exit 1; }
diff --git a/editors/openoffice.org-1.0/files/patch-set_soenv.1 b/editors/openoffice.org-1.0/files/patch-set_soenv.1
new file mode 100644
index 000000000000..d18d3038c06b
--- /dev/null
+++ b/editors/openoffice.org-1.0/files/patch-set_soenv.1
@@ -0,0 +1,218 @@
+--- config_office/set_soenv.1.orig Thu Oct 12 10:16:28 2000
++++ config_office/set_soenv.1 Sun Oct 15 23:12:53 2000
+@@ -11,7 +11,7 @@
+ # Description:
+ # set_soenv generates a file that contains all necessary
+ # environment variables for the build proces of OpenOffice
+-# on Linux, Solaris, Windows NT and Macosx.
++# on Linux, Solaris, FreeBSD, Windows NT and Macosx.
+ # This script prompts the installer to enter:
+ # 1. (if necessary) The directory where the jdk is located (JAVA_HOME).
+ # 2. (if necessary) The directory where the Microsoft C/C++ compiler is located (COMPATH).
+@@ -53,7 +53,7 @@
+ #--------------------------------------------------------
+ #
+ my ( $outfile, $bootfile, $newline, $comment, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,
+- $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $Winnt, $Macosx, $WScomp,
++ $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Freebsd, $Linux, $Winnt, $Macosx, $WScomp,
+ $GNUcomp, $platform, $machine_type, $empty, $no_jdk, $no_tcsh, $no_cl, $no_gcc, $no_gcc_home, $no_gcc_include,
+ $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $win_format_var);
+ #
+@@ -121,6 +121,7 @@
+ $L = " -L"; # library search path
+ $D = " -D"; # define search path
+ $Solaris = "SunOS"; # return of uname command on Solaris
++$Freebsd = "FreeBSD"; # return of uname command on FreeBSD
+ $Linux = "Linux"; # return of uname command on Linux
+ $Winnt = "WINNT"; # return of uname command on Windows NT
+ $Macosx = "Darwin"; # return of uname command on Macosx
+@@ -162,8 +163,8 @@
+ #
+ $platform = `uname`; # probing the platform
+ chomp( $platform );
+-if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) )
+-{ die "This script is only suitable for the Solaris, Linux, Windows NT or Macosx platform!\n";
++if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) ) && ( $platform ne $Freebsd )
++{ die "This script is only suitable for the Solaris, FreeBSD, Linux, Windows NT or Macosx platform!\n";
+ }
+ else
+ { if ( $platform eq $Solaris )
+@@ -254,6 +255,54 @@
+ $PROSWITCH = "-DPRODUCT";
+ $XPVERSION = "3";
+ }
++elsif ( $platform eq "$Freebsd" )
++{ if ($machine_type eq "i686")
++ { print "Setting FreeBSD Intel specific values... ";
++ $outfile = "LinuxIntelEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "I";
++ $CPUNAME = "INTEL";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngi3";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ else
++ { if ($machine_type eq "alpha")
++ { print "Setting FreeBSD/Alpha specific values... ";
++ $outfile = "FreeBSDAlphaEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "S";
++ $CPUNAME = "ALPHA";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngs";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ }
++}
+ elsif ( $platform eq "$Linux" )
+ { if ($machine_type eq "i686")
+ { print "Setting Linux Intel specific values... ";
+@@ -430,7 +479,7 @@
+ }
+ # 4. Gcc path.
+ # Check whether autoconf found the compiler path.
+-if ($platform eq $Linux)
++if ($platform eq $Linux) -o ($platform eq $Freebsd)
+ { if ( $ARGV[ 0 ] eq $no_gcc)
+ { AddWarning( "set_soenv", "Autoconf did not find correct gcc compiler, prompted for value" );
+ printf "Did you build gcc 2.95.2 from source using the --prefix and --enable-shared flags (y/n)?: ";
+@@ -643,6 +692,13 @@
+ $ps.$par_dir.$LIB.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $LD_LIBRARY_PATH = $cur_dir.
++ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
++ $ps.$USR_LOCAL.$LIB.
++ $ps.$par_dir.$LIB.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $LD_LIBRARY_PATH = $cur_dir.
+ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
+@@ -681,6 +737,21 @@
+ $D."PRODUCT".
+ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARDEF = '"'.$D."UNX".
++ $D.$COM.
++ $D.$CVER.
++ $D.$GVER.
++ $D."_PTHREADS".
++ $D.$OS.
++ $D.$CPUNAME.
++ $D."X86".
++ $D."_REENTRANT".
++ $D."_POSIX_PTHREAD_SEMANTICS".
++ $D."SUPD=$UPD".
++ $D."PRODUCT".
++ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARDEF = '"'.$D."UNX".
+ $D.$COM.
+@@ -707,6 +778,12 @@
+ $L.$USR_DT.$LIB.
+ $L.$USR_OPENWIN.$LIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
++ $L.$LIB.
++ $L.$USR.$LIB.
++ $L.$USR.$LOCAL.$LIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
+ $L.$LIB.
+@@ -721,6 +798,9 @@
+ if ($platform eq "$Solaris")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
+@@ -790,6 +870,20 @@
+ $ps.$USR_DT.$BIN.
+ $ps.$USR.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $PATH = $cur_dir.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
++ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
++ $ps.'$SOLARENV'.$BIN.
++ $ps.'$JAVA_HOME'.$BIN;
++
++ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
++
++ $PATH .= $ps.$USR.$ds."sbin".
++ $ps.$ETC.
++ $ps.$USR.$BIN.$ds."X11".
++ $ps.$USR.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $PATH = $cur_dir.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
+@@ -861,6 +955,17 @@
+ $L.'$JAVA_HOME'.$LIB.
+ $L.$XLIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARLIB = '"'.$L.$par_dir.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.$LIB.
++ $L.$USR_LIB.
++ $L.$USR_LOCAL.$LIB.
++ $L.'$JAVA_HOME'.$LIB.
++ $L.$XLIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARLIB = '"'.$L.$par_dir.$LIB.
+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+@@ -898,6 +1003,16 @@
+ $I.'$JAVA_HOME'.$INCLUDE.
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."solaris".
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".'"';
++}
++elsif ($platform eq "$Freebsd")
++{ $SOLARINC .= $I.$GXX_INCLUDE.
++ $I.'$SOLARENV'.$INC.$ds."Xp31".
++ $I.'$JAVA_HOME'.$INCLUDE.
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."linux".
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".
++ $I.$XINC.
++ $I.$GCC_INCLUDE.
++ $I.$USR.$INCLUDE.'"';
+ }
+ elsif ($platform eq "$Linux")
+ { $SOLARINC .= $I.$GXX_INCLUDE.
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile
index d510844e3a06..664b4dc13769 100644
--- a/editors/openoffice.org-1.1-devel/Makefile
+++ b/editors/openoffice.org-1.1-devel/Makefile
@@ -1,3 +1,4 @@
+# ex:ts=8
# New ports collection makefile for: StarOffice 5.2
# Date created: 22 August 2000
# Whom: Martin Blapp
@@ -5,91 +6,18 @@
# $FreeBSD$
#
-PORTNAME= staroffice
-PORTVERSION= 5.2
-CATEGORIES= editors linux
-MASTER_SITES= ftp://ftp.inf.utfsm.cl/pub/UTFSM/StarOffice_5.2/ \
- ftp://ftp.snerpa.is/pub/linux/ \
- ftp://ftp.osb.hu/pub/mirrors/staroffice/linux/ \
- ftp://ftp.uni-linz.ac.at/pub/staroffice_5.2/ \
- ftp://ftp.labyrinth.net.au/.5/kk/linux/star_office/ \
- ftp://ftp.acs.oakland.edu/files/Linux/StarOffice/office52/ \
- ftp://ftp.ctio.noao.edu/linux/ \
- ftp://sunsite.cnlab-switch.ch/mirror/staroffice/english/ \
- ftp://ftp.linux.tucows.com/pub/Linuxberg/ \
- ftp://ftp.jcu.edu.au/pub/StarOffice/ \
- ftp://ftp.uakom.sk/pub/mirrors/StarOffice/ \
- ftp://ftp.linux.hr/pub/staroffice/5.2/
-DISTNAME= so-5_2-ga-bin-linux-en.bin
-DISTFILES= soa-5_2-ga-bin-linux-en.bin so-5_2-ga-bin-linux-en.bin
-EXTRACT_ONLY=
+PORTNAME= openoffice
+PORTVERSION= 6.0.a605
+CATEGORIES= editors
+MASTER_SITES= http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
+DISTNAME= oo_605_src
-MAINTAINER= mb@imp.ch
+MAINTAINER= obrien@FreeBSD.org
-FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-
-ONLY_FOR_ARCHS= i386
-NO_CDROM= 'Must be downloaded direct from Sun via www interface'
-IS_INTERACTIVE= yes
-NO_BUILD= yes
-DIST_SUBDIR= staroffice52
-WRKSRC= ${WRKDIR}/office52
-TMPDIR= ${WRKDIR}/tmp
-LD_PATH= ${TMPDIR}:${WRKSRC}:${LINUXBASE}/lib:${LINUXBASE}/usr/lib
+CONFIGURE_WRKSRC= ${WRKSRC}/config_office
.include <bsd.port.pre.mk>
-pre-fetch:
-.if ${OSVERSION} < 410000
- @${ECHO}
- @${ECHO} OS-VERSION ${OSVERSION}
- @${ECHO}
- @${ECHO} Staroffice depends on a scripting fix for
- @${ECHO} /usr/src/sys/i386/linux/linux_sysvec.c
- @${ECHO} \(revision 1.55.2.1 or higher\)
- @${ECHO}
- @${ECHO} Please upgrade to FreeBSD 4.1
- @${ECHO}
- @${FALSE}
-.endif
-.if defined(WITH_CDROM)
-.if !exists(${CD_MOUNTPT}/linux/office52/setup)
- @${ECHO}
- @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
- @${ECHO} onto /cdrom and run make again.
- @${ECHO}
- @${FALSE}
-.endif
-.endif
-
-.if defined(WITH_CDROM)
-do-extract:
- @${MKDIR} ${WRKSRC}/office52
- @cd ${WRKSRC}/office52 && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
-.endif
-
-do-extract:
-.if !defined(DISPLAY) || ${DISPLAY} == ""
- @ ${ECHO}
- @ ${ECHO} Can\'t open display:
- @ ${ECHO} Please check your DISPLAY variable.
- @ ${ECHO}
- @ ${FALSE}
-.else
- @${MKDIR} ${WRKSRC}
- @${MKDIR} ${TMPDIR}
- @${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC}
- @${CP} ${_DISTDIR}/soa-5_2-ga-bin-linux-en.bin ${WRKSRC}
- @${CHMOD} 755 ${WRKSRC}/${DISTNAME}
- @${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
- @cd ${WRKSRC}
- @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
- @cd ../../
-.endif
-
-post-configure:
- @${PERL} -pi.orig -e 's|DefaultDestPath = "office52";|DefaultDestPath = "${PREFIX}/office52";|' ${WRKSRC}/setup.ins
-
do-install:
.if !defined(DISPLAY) || ${DISPLAY} == ""
@ ${ECHO}
diff --git a/editors/openoffice.org-1.1-devel/distinfo b/editors/openoffice.org-1.1-devel/distinfo
index f1e7894f7587..bc002ffc38b1 100644
--- a/editors/openoffice.org-1.1-devel/distinfo
+++ b/editors/openoffice.org-1.1-devel/distinfo
@@ -1,2 +1 @@
-MD5 (staroffice52/soa-5_2-ga-bin-linux-en.bin) = 8f36a55d7cefd919febdefb502ae986d
-MD5 (staroffice52/so-5_2-ga-bin-linux-en.bin) = 1f03de10b6127772ba87567d334aeb4d
+MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
diff --git a/editors/openoffice.org-1.1-devel/files/patch-bootstrap.1 b/editors/openoffice.org-1.1-devel/files/patch-bootstrap.1
new file mode 100644
index 000000000000..fc625e321cca
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-bootstrap.1
@@ -0,0 +1,11 @@
+--- config_office/bootstrap.1.orig Mon Sep 18 09:13:24 2000
++++ config_office/bootstrap.1 Fri Oct 13 17:51:37 2000
+@@ -9,6 +9,8 @@
+ make linux
+ else if ($platform == "Darwin") then
+ make macosx
++else if ($platform == "FreeBSD") then
++ make linux
+ endif
+
+ if "$?" != "0" exit
diff --git a/editors/openoffice.org-1.1-devel/files/patch-configure b/editors/openoffice.org-1.1-devel/files/patch-configure
new file mode 100644
index 000000000000..744225fe9d31
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-configure
@@ -0,0 +1,11 @@
+--- config_office/configure.orig Thu Oct 12 02:34:03 2000
++++ config_office/configure Fri Oct 13 17:52:25 2000
+@@ -739,7 +739,7 @@
+ echo $ac_n "checking the operating system""... $ac_c" 1>&6
+ echo "configure:741: checking the operating system" >&5
+ _os=`uname`
+-if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin"; then
++if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin" -o "$_os" = "FreeBSD"; then
+ echo "$ac_t""checked ($_os)" 1>&6
+ else
+ { echo "configure: error: $_os operating system is not suitable to build OpenOffice!" 1>&2; exit 1; }
diff --git a/editors/openoffice.org-1.1-devel/files/patch-set_soenv.1 b/editors/openoffice.org-1.1-devel/files/patch-set_soenv.1
new file mode 100644
index 000000000000..d18d3038c06b
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-set_soenv.1
@@ -0,0 +1,218 @@
+--- config_office/set_soenv.1.orig Thu Oct 12 10:16:28 2000
++++ config_office/set_soenv.1 Sun Oct 15 23:12:53 2000
+@@ -11,7 +11,7 @@
+ # Description:
+ # set_soenv generates a file that contains all necessary
+ # environment variables for the build proces of OpenOffice
+-# on Linux, Solaris, Windows NT and Macosx.
++# on Linux, Solaris, FreeBSD, Windows NT and Macosx.
+ # This script prompts the installer to enter:
+ # 1. (if necessary) The directory where the jdk is located (JAVA_HOME).
+ # 2. (if necessary) The directory where the Microsoft C/C++ compiler is located (COMPATH).
+@@ -53,7 +53,7 @@
+ #--------------------------------------------------------
+ #
+ my ( $outfile, $bootfile, $newline, $comment, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,
+- $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $Winnt, $Macosx, $WScomp,
++ $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Freebsd, $Linux, $Winnt, $Macosx, $WScomp,
+ $GNUcomp, $platform, $machine_type, $empty, $no_jdk, $no_tcsh, $no_cl, $no_gcc, $no_gcc_home, $no_gcc_include,
+ $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $win_format_var);
+ #
+@@ -121,6 +121,7 @@
+ $L = " -L"; # library search path
+ $D = " -D"; # define search path
+ $Solaris = "SunOS"; # return of uname command on Solaris
++$Freebsd = "FreeBSD"; # return of uname command on FreeBSD
+ $Linux = "Linux"; # return of uname command on Linux
+ $Winnt = "WINNT"; # return of uname command on Windows NT
+ $Macosx = "Darwin"; # return of uname command on Macosx
+@@ -162,8 +163,8 @@
+ #
+ $platform = `uname`; # probing the platform
+ chomp( $platform );
+-if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) )
+-{ die "This script is only suitable for the Solaris, Linux, Windows NT or Macosx platform!\n";
++if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) ) && ( $platform ne $Freebsd )
++{ die "This script is only suitable for the Solaris, FreeBSD, Linux, Windows NT or Macosx platform!\n";
+ }
+ else
+ { if ( $platform eq $Solaris )
+@@ -254,6 +255,54 @@
+ $PROSWITCH = "-DPRODUCT";
+ $XPVERSION = "3";
+ }
++elsif ( $platform eq "$Freebsd" )
++{ if ($machine_type eq "i686")
++ { print "Setting FreeBSD Intel specific values... ";
++ $outfile = "LinuxIntelEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "I";
++ $CPUNAME = "INTEL";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngi3";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ else
++ { if ($machine_type eq "alpha")
++ { print "Setting FreeBSD/Alpha specific values... ";
++ $outfile = "FreeBSDAlphaEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "S";
++ $CPUNAME = "ALPHA";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngs";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ }
++}
+ elsif ( $platform eq "$Linux" )
+ { if ($machine_type eq "i686")
+ { print "Setting Linux Intel specific values... ";
+@@ -430,7 +479,7 @@
+ }
+ # 4. Gcc path.
+ # Check whether autoconf found the compiler path.
+-if ($platform eq $Linux)
++if ($platform eq $Linux) -o ($platform eq $Freebsd)
+ { if ( $ARGV[ 0 ] eq $no_gcc)
+ { AddWarning( "set_soenv", "Autoconf did not find correct gcc compiler, prompted for value" );
+ printf "Did you build gcc 2.95.2 from source using the --prefix and --enable-shared flags (y/n)?: ";
+@@ -643,6 +692,13 @@
+ $ps.$par_dir.$LIB.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $LD_LIBRARY_PATH = $cur_dir.
++ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
++ $ps.$USR_LOCAL.$LIB.
++ $ps.$par_dir.$LIB.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $LD_LIBRARY_PATH = $cur_dir.
+ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
+@@ -681,6 +737,21 @@
+ $D."PRODUCT".
+ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARDEF = '"'.$D."UNX".
++ $D.$COM.
++ $D.$CVER.
++ $D.$GVER.
++ $D."_PTHREADS".
++ $D.$OS.
++ $D.$CPUNAME.
++ $D."X86".
++ $D."_REENTRANT".
++ $D."_POSIX_PTHREAD_SEMANTICS".
++ $D."SUPD=$UPD".
++ $D."PRODUCT".
++ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARDEF = '"'.$D."UNX".
+ $D.$COM.
+@@ -707,6 +778,12 @@
+ $L.$USR_DT.$LIB.
+ $L.$USR_OPENWIN.$LIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
++ $L.$LIB.
++ $L.$USR.$LIB.
++ $L.$USR.$LOCAL.$LIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
+ $L.$LIB.
+@@ -721,6 +798,9 @@
+ if ($platform eq "$Solaris")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
+@@ -790,6 +870,20 @@
+ $ps.$USR_DT.$BIN.
+ $ps.$USR.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $PATH = $cur_dir.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
++ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
++ $ps.'$SOLARENV'.$BIN.
++ $ps.'$JAVA_HOME'.$BIN;
++
++ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
++
++ $PATH .= $ps.$USR.$ds."sbin".
++ $ps.$ETC.
++ $ps.$USR.$BIN.$ds."X11".
++ $ps.$USR.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $PATH = $cur_dir.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
+@@ -861,6 +955,17 @@
+ $L.'$JAVA_HOME'.$LIB.
+ $L.$XLIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARLIB = '"'.$L.$par_dir.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.$LIB.
++ $L.$USR_LIB.
++ $L.$USR_LOCAL.$LIB.
++ $L.'$JAVA_HOME'.$LIB.
++ $L.$XLIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARLIB = '"'.$L.$par_dir.$LIB.
+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+@@ -898,6 +1003,16 @@
+ $I.'$JAVA_HOME'.$INCLUDE.
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."solaris".
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".'"';
++}
++elsif ($platform eq "$Freebsd")
++{ $SOLARINC .= $I.$GXX_INCLUDE.
++ $I.'$SOLARENV'.$INC.$ds."Xp31".
++ $I.'$JAVA_HOME'.$INCLUDE.
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."linux".
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".
++ $I.$XINC.
++ $I.$GCC_INCLUDE.
++ $I.$USR.$INCLUDE.'"';
+ }
+ elsif ($platform eq "$Linux")
+ { $SOLARINC .= $I.$GXX_INCLUDE.
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile
index d510844e3a06..664b4dc13769 100644
--- a/editors/openoffice.org-1.1/Makefile
+++ b/editors/openoffice.org-1.1/Makefile
@@ -1,3 +1,4 @@
+# ex:ts=8
# New ports collection makefile for: StarOffice 5.2
# Date created: 22 August 2000
# Whom: Martin Blapp
@@ -5,91 +6,18 @@
# $FreeBSD$
#
-PORTNAME= staroffice
-PORTVERSION= 5.2
-CATEGORIES= editors linux
-MASTER_SITES= ftp://ftp.inf.utfsm.cl/pub/UTFSM/StarOffice_5.2/ \
- ftp://ftp.snerpa.is/pub/linux/ \
- ftp://ftp.osb.hu/pub/mirrors/staroffice/linux/ \
- ftp://ftp.uni-linz.ac.at/pub/staroffice_5.2/ \
- ftp://ftp.labyrinth.net.au/.5/kk/linux/star_office/ \
- ftp://ftp.acs.oakland.edu/files/Linux/StarOffice/office52/ \
- ftp://ftp.ctio.noao.edu/linux/ \
- ftp://sunsite.cnlab-switch.ch/mirror/staroffice/english/ \
- ftp://ftp.linux.tucows.com/pub/Linuxberg/ \
- ftp://ftp.jcu.edu.au/pub/StarOffice/ \
- ftp://ftp.uakom.sk/pub/mirrors/StarOffice/ \
- ftp://ftp.linux.hr/pub/staroffice/5.2/
-DISTNAME= so-5_2-ga-bin-linux-en.bin
-DISTFILES= soa-5_2-ga-bin-linux-en.bin so-5_2-ga-bin-linux-en.bin
-EXTRACT_ONLY=
+PORTNAME= openoffice
+PORTVERSION= 6.0.a605
+CATEGORIES= editors
+MASTER_SITES= http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
+DISTNAME= oo_605_src
-MAINTAINER= mb@imp.ch
+MAINTAINER= obrien@FreeBSD.org
-FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-
-ONLY_FOR_ARCHS= i386
-NO_CDROM= 'Must be downloaded direct from Sun via www interface'
-IS_INTERACTIVE= yes
-NO_BUILD= yes
-DIST_SUBDIR= staroffice52
-WRKSRC= ${WRKDIR}/office52
-TMPDIR= ${WRKDIR}/tmp
-LD_PATH= ${TMPDIR}:${WRKSRC}:${LINUXBASE}/lib:${LINUXBASE}/usr/lib
+CONFIGURE_WRKSRC= ${WRKSRC}/config_office
.include <bsd.port.pre.mk>
-pre-fetch:
-.if ${OSVERSION} < 410000
- @${ECHO}
- @${ECHO} OS-VERSION ${OSVERSION}
- @${ECHO}
- @${ECHO} Staroffice depends on a scripting fix for
- @${ECHO} /usr/src/sys/i386/linux/linux_sysvec.c
- @${ECHO} \(revision 1.55.2.1 or higher\)
- @${ECHO}
- @${ECHO} Please upgrade to FreeBSD 4.1
- @${ECHO}
- @${FALSE}
-.endif
-.if defined(WITH_CDROM)
-.if !exists(${CD_MOUNTPT}/linux/office52/setup)
- @${ECHO}
- @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
- @${ECHO} onto /cdrom and run make again.
- @${ECHO}
- @${FALSE}
-.endif
-.endif
-
-.if defined(WITH_CDROM)
-do-extract:
- @${MKDIR} ${WRKSRC}/office52
- @cd ${WRKSRC}/office52 && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
-.endif
-
-do-extract:
-.if !defined(DISPLAY) || ${DISPLAY} == ""
- @ ${ECHO}
- @ ${ECHO} Can\'t open display:
- @ ${ECHO} Please check your DISPLAY variable.
- @ ${ECHO}
- @ ${FALSE}
-.else
- @${MKDIR} ${WRKSRC}
- @${MKDIR} ${TMPDIR}
- @${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC}
- @${CP} ${_DISTDIR}/soa-5_2-ga-bin-linux-en.bin ${WRKSRC}
- @${CHMOD} 755 ${WRKSRC}/${DISTNAME}
- @${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
- @cd ${WRKSRC}
- @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
- @cd ../../
-.endif
-
-post-configure:
- @${PERL} -pi.orig -e 's|DefaultDestPath = "office52";|DefaultDestPath = "${PREFIX}/office52";|' ${WRKSRC}/setup.ins
-
do-install:
.if !defined(DISPLAY) || ${DISPLAY} == ""
@ ${ECHO}
diff --git a/editors/openoffice.org-1.1/distinfo b/editors/openoffice.org-1.1/distinfo
index f1e7894f7587..bc002ffc38b1 100644
--- a/editors/openoffice.org-1.1/distinfo
+++ b/editors/openoffice.org-1.1/distinfo
@@ -1,2 +1 @@
-MD5 (staroffice52/soa-5_2-ga-bin-linux-en.bin) = 8f36a55d7cefd919febdefb502ae986d
-MD5 (staroffice52/so-5_2-ga-bin-linux-en.bin) = 1f03de10b6127772ba87567d334aeb4d
+MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
diff --git a/editors/openoffice.org-1.1/files/patch-bootstrap.1 b/editors/openoffice.org-1.1/files/patch-bootstrap.1
new file mode 100644
index 000000000000..fc625e321cca
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/patch-bootstrap.1
@@ -0,0 +1,11 @@
+--- config_office/bootstrap.1.orig Mon Sep 18 09:13:24 2000
++++ config_office/bootstrap.1 Fri Oct 13 17:51:37 2000
+@@ -9,6 +9,8 @@
+ make linux
+ else if ($platform == "Darwin") then
+ make macosx
++else if ($platform == "FreeBSD") then
++ make linux
+ endif
+
+ if "$?" != "0" exit
diff --git a/editors/openoffice.org-1.1/files/patch-configure b/editors/openoffice.org-1.1/files/patch-configure
new file mode 100644
index 000000000000..744225fe9d31
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/patch-configure
@@ -0,0 +1,11 @@
+--- config_office/configure.orig Thu Oct 12 02:34:03 2000
++++ config_office/configure Fri Oct 13 17:52:25 2000
+@@ -739,7 +739,7 @@
+ echo $ac_n "checking the operating system""... $ac_c" 1>&6
+ echo "configure:741: checking the operating system" >&5
+ _os=`uname`
+-if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin"; then
++if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin" -o "$_os" = "FreeBSD"; then
+ echo "$ac_t""checked ($_os)" 1>&6
+ else
+ { echo "configure: error: $_os operating system is not suitable to build OpenOffice!" 1>&2; exit 1; }
diff --git a/editors/openoffice.org-1.1/files/patch-set_soenv.1 b/editors/openoffice.org-1.1/files/patch-set_soenv.1
new file mode 100644
index 000000000000..d18d3038c06b
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/patch-set_soenv.1
@@ -0,0 +1,218 @@
+--- config_office/set_soenv.1.orig Thu Oct 12 10:16:28 2000
++++ config_office/set_soenv.1 Sun Oct 15 23:12:53 2000
+@@ -11,7 +11,7 @@
+ # Description:
+ # set_soenv generates a file that contains all necessary
+ # environment variables for the build proces of OpenOffice
+-# on Linux, Solaris, Windows NT and Macosx.
++# on Linux, Solaris, FreeBSD, Windows NT and Macosx.
+ # This script prompts the installer to enter:
+ # 1. (if necessary) The directory where the jdk is located (JAVA_HOME).
+ # 2. (if necessary) The directory where the Microsoft C/C++ compiler is located (COMPATH).
+@@ -53,7 +53,7 @@
+ #--------------------------------------------------------
+ #
+ my ( $outfile, $bootfile, $newline, $comment, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,
+- $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $Winnt, $Macosx, $WScomp,
++ $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Freebsd, $Linux, $Winnt, $Macosx, $WScomp,
+ $GNUcomp, $platform, $machine_type, $empty, $no_jdk, $no_tcsh, $no_cl, $no_gcc, $no_gcc_home, $no_gcc_include,
+ $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $win_format_var);
+ #
+@@ -121,6 +121,7 @@
+ $L = " -L"; # library search path
+ $D = " -D"; # define search path
+ $Solaris = "SunOS"; # return of uname command on Solaris
++$Freebsd = "FreeBSD"; # return of uname command on FreeBSD
+ $Linux = "Linux"; # return of uname command on Linux
+ $Winnt = "WINNT"; # return of uname command on Windows NT
+ $Macosx = "Darwin"; # return of uname command on Macosx
+@@ -162,8 +163,8 @@
+ #
+ $platform = `uname`; # probing the platform
+ chomp( $platform );
+-if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) )
+-{ die "This script is only suitable for the Solaris, Linux, Windows NT or Macosx platform!\n";
++if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) ) && ( $platform ne $Freebsd )
++{ die "This script is only suitable for the Solaris, FreeBSD, Linux, Windows NT or Macosx platform!\n";
+ }
+ else
+ { if ( $platform eq $Solaris )
+@@ -254,6 +255,54 @@
+ $PROSWITCH = "-DPRODUCT";
+ $XPVERSION = "3";
+ }
++elsif ( $platform eq "$Freebsd" )
++{ if ($machine_type eq "i686")
++ { print "Setting FreeBSD Intel specific values... ";
++ $outfile = "LinuxIntelEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "I";
++ $CPUNAME = "INTEL";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngi3";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ else
++ { if ($machine_type eq "alpha")
++ { print "Setting FreeBSD/Alpha specific values... ";
++ $outfile = "FreeBSDAlphaEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "S";
++ $CPUNAME = "ALPHA";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngs";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ }
++}
+ elsif ( $platform eq "$Linux" )
+ { if ($machine_type eq "i686")
+ { print "Setting Linux Intel specific values... ";
+@@ -430,7 +479,7 @@
+ }
+ # 4. Gcc path.
+ # Check whether autoconf found the compiler path.
+-if ($platform eq $Linux)
++if ($platform eq $Linux) -o ($platform eq $Freebsd)
+ { if ( $ARGV[ 0 ] eq $no_gcc)
+ { AddWarning( "set_soenv", "Autoconf did not find correct gcc compiler, prompted for value" );
+ printf "Did you build gcc 2.95.2 from source using the --prefix and --enable-shared flags (y/n)?: ";
+@@ -643,6 +692,13 @@
+ $ps.$par_dir.$LIB.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $LD_LIBRARY_PATH = $cur_dir.
++ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
++ $ps.$USR_LOCAL.$LIB.
++ $ps.$par_dir.$LIB.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $LD_LIBRARY_PATH = $cur_dir.
+ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
+@@ -681,6 +737,21 @@
+ $D."PRODUCT".
+ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARDEF = '"'.$D."UNX".
++ $D.$COM.
++ $D.$CVER.
++ $D.$GVER.
++ $D."_PTHREADS".
++ $D.$OS.
++ $D.$CPUNAME.
++ $D."X86".
++ $D."_REENTRANT".
++ $D."_POSIX_PTHREAD_SEMANTICS".
++ $D."SUPD=$UPD".
++ $D."PRODUCT".
++ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARDEF = '"'.$D."UNX".
+ $D.$COM.
+@@ -707,6 +778,12 @@
+ $L.$USR_DT.$LIB.
+ $L.$USR_OPENWIN.$LIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
++ $L.$LIB.
++ $L.$USR.$LIB.
++ $L.$USR.$LOCAL.$LIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
+ $L.$LIB.
+@@ -721,6 +798,9 @@
+ if ($platform eq "$Solaris")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
+@@ -790,6 +870,20 @@
+ $ps.$USR_DT.$BIN.
+ $ps.$USR.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $PATH = $cur_dir.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
++ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
++ $ps.'$SOLARENV'.$BIN.
++ $ps.'$JAVA_HOME'.$BIN;
++
++ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
++
++ $PATH .= $ps.$USR.$ds."sbin".
++ $ps.$ETC.
++ $ps.$USR.$BIN.$ds."X11".
++ $ps.$USR.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $PATH = $cur_dir.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
+@@ -861,6 +955,17 @@
+ $L.'$JAVA_HOME'.$LIB.
+ $L.$XLIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARLIB = '"'.$L.$par_dir.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.$LIB.
++ $L.$USR_LIB.
++ $L.$USR_LOCAL.$LIB.
++ $L.'$JAVA_HOME'.$LIB.
++ $L.$XLIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARLIB = '"'.$L.$par_dir.$LIB.
+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+@@ -898,6 +1003,16 @@
+ $I.'$JAVA_HOME'.$INCLUDE.
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."solaris".
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".'"';
++}
++elsif ($platform eq "$Freebsd")
++{ $SOLARINC .= $I.$GXX_INCLUDE.
++ $I.'$SOLARENV'.$INC.$ds."Xp31".
++ $I.'$JAVA_HOME'.$INCLUDE.
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."linux".
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".
++ $I.$XINC.
++ $I.$GCC_INCLUDE.
++ $I.$USR.$INCLUDE.'"';
+ }
+ elsif ($platform eq "$Linux")
+ { $SOLARINC .= $I.$GXX_INCLUDE.
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index d510844e3a06..664b4dc13769 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -1,3 +1,4 @@
+# ex:ts=8
# New ports collection makefile for: StarOffice 5.2
# Date created: 22 August 2000
# Whom: Martin Blapp
@@ -5,91 +6,18 @@
# $FreeBSD$
#
-PORTNAME= staroffice
-PORTVERSION= 5.2
-CATEGORIES= editors linux
-MASTER_SITES= ftp://ftp.inf.utfsm.cl/pub/UTFSM/StarOffice_5.2/ \
- ftp://ftp.snerpa.is/pub/linux/ \
- ftp://ftp.osb.hu/pub/mirrors/staroffice/linux/ \
- ftp://ftp.uni-linz.ac.at/pub/staroffice_5.2/ \
- ftp://ftp.labyrinth.net.au/.5/kk/linux/star_office/ \
- ftp://ftp.acs.oakland.edu/files/Linux/StarOffice/office52/ \
- ftp://ftp.ctio.noao.edu/linux/ \
- ftp://sunsite.cnlab-switch.ch/mirror/staroffice/english/ \
- ftp://ftp.linux.tucows.com/pub/Linuxberg/ \
- ftp://ftp.jcu.edu.au/pub/StarOffice/ \
- ftp://ftp.uakom.sk/pub/mirrors/StarOffice/ \
- ftp://ftp.linux.hr/pub/staroffice/5.2/
-DISTNAME= so-5_2-ga-bin-linux-en.bin
-DISTFILES= soa-5_2-ga-bin-linux-en.bin so-5_2-ga-bin-linux-en.bin
-EXTRACT_ONLY=
+PORTNAME= openoffice
+PORTVERSION= 6.0.a605
+CATEGORIES= editors
+MASTER_SITES= http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
+DISTNAME= oo_605_src
-MAINTAINER= mb@imp.ch
+MAINTAINER= obrien@FreeBSD.org
-FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-
-ONLY_FOR_ARCHS= i386
-NO_CDROM= 'Must be downloaded direct from Sun via www interface'
-IS_INTERACTIVE= yes
-NO_BUILD= yes
-DIST_SUBDIR= staroffice52
-WRKSRC= ${WRKDIR}/office52
-TMPDIR= ${WRKDIR}/tmp
-LD_PATH= ${TMPDIR}:${WRKSRC}:${LINUXBASE}/lib:${LINUXBASE}/usr/lib
+CONFIGURE_WRKSRC= ${WRKSRC}/config_office
.include <bsd.port.pre.mk>
-pre-fetch:
-.if ${OSVERSION} < 410000
- @${ECHO}
- @${ECHO} OS-VERSION ${OSVERSION}
- @${ECHO}
- @${ECHO} Staroffice depends on a scripting fix for
- @${ECHO} /usr/src/sys/i386/linux/linux_sysvec.c
- @${ECHO} \(revision 1.55.2.1 or higher\)
- @${ECHO}
- @${ECHO} Please upgrade to FreeBSD 4.1
- @${ECHO}
- @${FALSE}
-.endif
-.if defined(WITH_CDROM)
-.if !exists(${CD_MOUNTPT}/linux/office52/setup)
- @${ECHO}
- @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
- @${ECHO} onto /cdrom and run make again.
- @${ECHO}
- @${FALSE}
-.endif
-.endif
-
-.if defined(WITH_CDROM)
-do-extract:
- @${MKDIR} ${WRKSRC}/office52
- @cd ${WRKSRC}/office52 && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
-.endif
-
-do-extract:
-.if !defined(DISPLAY) || ${DISPLAY} == ""
- @ ${ECHO}
- @ ${ECHO} Can\'t open display:
- @ ${ECHO} Please check your DISPLAY variable.
- @ ${ECHO}
- @ ${FALSE}
-.else
- @${MKDIR} ${WRKSRC}
- @${MKDIR} ${TMPDIR}
- @${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC}
- @${CP} ${_DISTDIR}/soa-5_2-ga-bin-linux-en.bin ${WRKSRC}
- @${CHMOD} 755 ${WRKSRC}/${DISTNAME}
- @${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
- @cd ${WRKSRC}
- @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
- @cd ../../
-.endif
-
-post-configure:
- @${PERL} -pi.orig -e 's|DefaultDestPath = "office52";|DefaultDestPath = "${PREFIX}/office52";|' ${WRKSRC}/setup.ins
-
do-install:
.if !defined(DISPLAY) || ${DISPLAY} == ""
@ ${ECHO}
diff --git a/editors/openoffice.org-2-RC/distinfo b/editors/openoffice.org-2-RC/distinfo
index f1e7894f7587..bc002ffc38b1 100644
--- a/editors/openoffice.org-2-RC/distinfo
+++ b/editors/openoffice.org-2-RC/distinfo
@@ -1,2 +1 @@
-MD5 (staroffice52/soa-5_2-ga-bin-linux-en.bin) = 8f36a55d7cefd919febdefb502ae986d
-MD5 (staroffice52/so-5_2-ga-bin-linux-en.bin) = 1f03de10b6127772ba87567d334aeb4d
+MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
diff --git a/editors/openoffice.org-2-RC/files/patch-bootstrap.1 b/editors/openoffice.org-2-RC/files/patch-bootstrap.1
new file mode 100644
index 000000000000..fc625e321cca
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-bootstrap.1
@@ -0,0 +1,11 @@
+--- config_office/bootstrap.1.orig Mon Sep 18 09:13:24 2000
++++ config_office/bootstrap.1 Fri Oct 13 17:51:37 2000
+@@ -9,6 +9,8 @@
+ make linux
+ else if ($platform == "Darwin") then
+ make macosx
++else if ($platform == "FreeBSD") then
++ make linux
+ endif
+
+ if "$?" != "0" exit
diff --git a/editors/openoffice.org-2-RC/files/patch-configure b/editors/openoffice.org-2-RC/files/patch-configure
new file mode 100644
index 000000000000..744225fe9d31
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-configure
@@ -0,0 +1,11 @@
+--- config_office/configure.orig Thu Oct 12 02:34:03 2000
++++ config_office/configure Fri Oct 13 17:52:25 2000
+@@ -739,7 +739,7 @@
+ echo $ac_n "checking the operating system""... $ac_c" 1>&6
+ echo "configure:741: checking the operating system" >&5
+ _os=`uname`
+-if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin"; then
++if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin" -o "$_os" = "FreeBSD"; then
+ echo "$ac_t""checked ($_os)" 1>&6
+ else
+ { echo "configure: error: $_os operating system is not suitable to build OpenOffice!" 1>&2; exit 1; }
diff --git a/editors/openoffice.org-2-RC/files/patch-set_soenv.1 b/editors/openoffice.org-2-RC/files/patch-set_soenv.1
new file mode 100644
index 000000000000..d18d3038c06b
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-set_soenv.1
@@ -0,0 +1,218 @@
+--- config_office/set_soenv.1.orig Thu Oct 12 10:16:28 2000
++++ config_office/set_soenv.1 Sun Oct 15 23:12:53 2000
+@@ -11,7 +11,7 @@
+ # Description:
+ # set_soenv generates a file that contains all necessary
+ # environment variables for the build proces of OpenOffice
+-# on Linux, Solaris, Windows NT and Macosx.
++# on Linux, Solaris, FreeBSD, Windows NT and Macosx.
+ # This script prompts the installer to enter:
+ # 1. (if necessary) The directory where the jdk is located (JAVA_HOME).
+ # 2. (if necessary) The directory where the Microsoft C/C++ compiler is located (COMPATH).
+@@ -53,7 +53,7 @@
+ #--------------------------------------------------------
+ #
+ my ( $outfile, $bootfile, $newline, $comment, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,
+- $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $Winnt, $Macosx, $WScomp,
++ $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Freebsd, $Linux, $Winnt, $Macosx, $WScomp,
+ $GNUcomp, $platform, $machine_type, $empty, $no_jdk, $no_tcsh, $no_cl, $no_gcc, $no_gcc_home, $no_gcc_include,
+ $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $win_format_var);
+ #
+@@ -121,6 +121,7 @@
+ $L = " -L"; # library search path
+ $D = " -D"; # define search path
+ $Solaris = "SunOS"; # return of uname command on Solaris
++$Freebsd = "FreeBSD"; # return of uname command on FreeBSD
+ $Linux = "Linux"; # return of uname command on Linux
+ $Winnt = "WINNT"; # return of uname command on Windows NT
+ $Macosx = "Darwin"; # return of uname command on Macosx
+@@ -162,8 +163,8 @@
+ #
+ $platform = `uname`; # probing the platform
+ chomp( $platform );
+-if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) )
+-{ die "This script is only suitable for the Solaris, Linux, Windows NT or Macosx platform!\n";
++if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) ) && ( $platform ne $Freebsd )
++{ die "This script is only suitable for the Solaris, FreeBSD, Linux, Windows NT or Macosx platform!\n";
+ }
+ else
+ { if ( $platform eq $Solaris )
+@@ -254,6 +255,54 @@
+ $PROSWITCH = "-DPRODUCT";
+ $XPVERSION = "3";
+ }
++elsif ( $platform eq "$Freebsd" )
++{ if ($machine_type eq "i686")
++ { print "Setting FreeBSD Intel specific values... ";
++ $outfile = "LinuxIntelEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "I";
++ $CPUNAME = "INTEL";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngi3";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ else
++ { if ($machine_type eq "alpha")
++ { print "Setting FreeBSD/Alpha specific values... ";
++ $outfile = "FreeBSDAlphaEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "S";
++ $CPUNAME = "ALPHA";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngs";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ }
++}
+ elsif ( $platform eq "$Linux" )
+ { if ($machine_type eq "i686")
+ { print "Setting Linux Intel specific values... ";
+@@ -430,7 +479,7 @@
+ }
+ # 4. Gcc path.
+ # Check whether autoconf found the compiler path.
+-if ($platform eq $Linux)
++if ($platform eq $Linux) -o ($platform eq $Freebsd)
+ { if ( $ARGV[ 0 ] eq $no_gcc)
+ { AddWarning( "set_soenv", "Autoconf did not find correct gcc compiler, prompted for value" );
+ printf "Did you build gcc 2.95.2 from source using the --prefix and --enable-shared flags (y/n)?: ";
+@@ -643,6 +692,13 @@
+ $ps.$par_dir.$LIB.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $LD_LIBRARY_PATH = $cur_dir.
++ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
++ $ps.$USR_LOCAL.$LIB.
++ $ps.$par_dir.$LIB.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $LD_LIBRARY_PATH = $cur_dir.
+ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
+@@ -681,6 +737,21 @@
+ $D."PRODUCT".
+ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARDEF = '"'.$D."UNX".
++ $D.$COM.
++ $D.$CVER.
++ $D.$GVER.
++ $D."_PTHREADS".
++ $D.$OS.
++ $D.$CPUNAME.
++ $D."X86".
++ $D."_REENTRANT".
++ $D."_POSIX_PTHREAD_SEMANTICS".
++ $D."SUPD=$UPD".
++ $D."PRODUCT".
++ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARDEF = '"'.$D."UNX".
+ $D.$COM.
+@@ -707,6 +778,12 @@
+ $L.$USR_DT.$LIB.
+ $L.$USR_OPENWIN.$LIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
++ $L.$LIB.
++ $L.$USR.$LIB.
++ $L.$USR.$LOCAL.$LIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
+ $L.$LIB.
+@@ -721,6 +798,9 @@
+ if ($platform eq "$Solaris")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
+@@ -790,6 +870,20 @@
+ $ps.$USR_DT.$BIN.
+ $ps.$USR.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $PATH = $cur_dir.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
++ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
++ $ps.'$SOLARENV'.$BIN.
++ $ps.'$JAVA_HOME'.$BIN;
++
++ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
++
++ $PATH .= $ps.$USR.$ds."sbin".
++ $ps.$ETC.
++ $ps.$USR.$BIN.$ds."X11".
++ $ps.$USR.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $PATH = $cur_dir.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
+@@ -861,6 +955,17 @@
+ $L.'$JAVA_HOME'.$LIB.
+ $L.$XLIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARLIB = '"'.$L.$par_dir.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.$LIB.
++ $L.$USR_LIB.
++ $L.$USR_LOCAL.$LIB.
++ $L.'$JAVA_HOME'.$LIB.
++ $L.$XLIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARLIB = '"'.$L.$par_dir.$LIB.
+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+@@ -898,6 +1003,16 @@
+ $I.'$JAVA_HOME'.$INCLUDE.
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."solaris".
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".'"';
++}
++elsif ($platform eq "$Freebsd")
++{ $SOLARINC .= $I.$GXX_INCLUDE.
++ $I.'$SOLARENV'.$INC.$ds."Xp31".
++ $I.'$JAVA_HOME'.$INCLUDE.
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."linux".
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".
++ $I.$XINC.
++ $I.$GCC_INCLUDE.
++ $I.$USR.$INCLUDE.'"';
+ }
+ elsif ($platform eq "$Linux")
+ { $SOLARINC .= $I.$GXX_INCLUDE.
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index d510844e3a06..664b4dc13769 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -1,3 +1,4 @@
+# ex:ts=8
# New ports collection makefile for: StarOffice 5.2
# Date created: 22 August 2000
# Whom: Martin Blapp
@@ -5,91 +6,18 @@
# $FreeBSD$
#
-PORTNAME= staroffice
-PORTVERSION= 5.2
-CATEGORIES= editors linux
-MASTER_SITES= ftp://ftp.inf.utfsm.cl/pub/UTFSM/StarOffice_5.2/ \
- ftp://ftp.snerpa.is/pub/linux/ \
- ftp://ftp.osb.hu/pub/mirrors/staroffice/linux/ \
- ftp://ftp.uni-linz.ac.at/pub/staroffice_5.2/ \
- ftp://ftp.labyrinth.net.au/.5/kk/linux/star_office/ \
- ftp://ftp.acs.oakland.edu/files/Linux/StarOffice/office52/ \
- ftp://ftp.ctio.noao.edu/linux/ \
- ftp://sunsite.cnlab-switch.ch/mirror/staroffice/english/ \
- ftp://ftp.linux.tucows.com/pub/Linuxberg/ \
- ftp://ftp.jcu.edu.au/pub/StarOffice/ \
- ftp://ftp.uakom.sk/pub/mirrors/StarOffice/ \
- ftp://ftp.linux.hr/pub/staroffice/5.2/
-DISTNAME= so-5_2-ga-bin-linux-en.bin
-DISTFILES= soa-5_2-ga-bin-linux-en.bin so-5_2-ga-bin-linux-en.bin
-EXTRACT_ONLY=
+PORTNAME= openoffice
+PORTVERSION= 6.0.a605
+CATEGORIES= editors
+MASTER_SITES= http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
+DISTNAME= oo_605_src
-MAINTAINER= mb@imp.ch
+MAINTAINER= obrien@FreeBSD.org
-FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-
-ONLY_FOR_ARCHS= i386
-NO_CDROM= 'Must be downloaded direct from Sun via www interface'
-IS_INTERACTIVE= yes
-NO_BUILD= yes
-DIST_SUBDIR= staroffice52
-WRKSRC= ${WRKDIR}/office52
-TMPDIR= ${WRKDIR}/tmp
-LD_PATH= ${TMPDIR}:${WRKSRC}:${LINUXBASE}/lib:${LINUXBASE}/usr/lib
+CONFIGURE_WRKSRC= ${WRKSRC}/config_office
.include <bsd.port.pre.mk>
-pre-fetch:
-.if ${OSVERSION} < 410000
- @${ECHO}
- @${ECHO} OS-VERSION ${OSVERSION}
- @${ECHO}
- @${ECHO} Staroffice depends on a scripting fix for
- @${ECHO} /usr/src/sys/i386/linux/linux_sysvec.c
- @${ECHO} \(revision 1.55.2.1 or higher\)
- @${ECHO}
- @${ECHO} Please upgrade to FreeBSD 4.1
- @${ECHO}
- @${FALSE}
-.endif
-.if defined(WITH_CDROM)
-.if !exists(${CD_MOUNTPT}/linux/office52/setup)
- @${ECHO}
- @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
- @${ECHO} onto /cdrom and run make again.
- @${ECHO}
- @${FALSE}
-.endif
-.endif
-
-.if defined(WITH_CDROM)
-do-extract:
- @${MKDIR} ${WRKSRC}/office52
- @cd ${WRKSRC}/office52 && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
-.endif
-
-do-extract:
-.if !defined(DISPLAY) || ${DISPLAY} == ""
- @ ${ECHO}
- @ ${ECHO} Can\'t open display:
- @ ${ECHO} Please check your DISPLAY variable.
- @ ${ECHO}
- @ ${FALSE}
-.else
- @${MKDIR} ${WRKSRC}
- @${MKDIR} ${TMPDIR}
- @${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC}
- @${CP} ${_DISTDIR}/soa-5_2-ga-bin-linux-en.bin ${WRKSRC}
- @${CHMOD} 755 ${WRKSRC}/${DISTNAME}
- @${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
- @cd ${WRKSRC}
- @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
- @cd ../../
-.endif
-
-post-configure:
- @${PERL} -pi.orig -e 's|DefaultDestPath = "office52";|DefaultDestPath = "${PREFIX}/office52";|' ${WRKSRC}/setup.ins
-
do-install:
.if !defined(DISPLAY) || ${DISPLAY} == ""
@ ${ECHO}
diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo
index f1e7894f7587..bc002ffc38b1 100644
--- a/editors/openoffice.org-2-devel/distinfo
+++ b/editors/openoffice.org-2-devel/distinfo
@@ -1,2 +1 @@
-MD5 (staroffice52/soa-5_2-ga-bin-linux-en.bin) = 8f36a55d7cefd919febdefb502ae986d
-MD5 (staroffice52/so-5_2-ga-bin-linux-en.bin) = 1f03de10b6127772ba87567d334aeb4d
+MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
diff --git a/editors/openoffice.org-2-devel/files/patch-bootstrap.1 b/editors/openoffice.org-2-devel/files/patch-bootstrap.1
new file mode 100644
index 000000000000..fc625e321cca
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-bootstrap.1
@@ -0,0 +1,11 @@
+--- config_office/bootstrap.1.orig Mon Sep 18 09:13:24 2000
++++ config_office/bootstrap.1 Fri Oct 13 17:51:37 2000
+@@ -9,6 +9,8 @@
+ make linux
+ else if ($platform == "Darwin") then
+ make macosx
++else if ($platform == "FreeBSD") then
++ make linux
+ endif
+
+ if "$?" != "0" exit
diff --git a/editors/openoffice.org-2-devel/files/patch-configure b/editors/openoffice.org-2-devel/files/patch-configure
new file mode 100644
index 000000000000..744225fe9d31
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-configure
@@ -0,0 +1,11 @@
+--- config_office/configure.orig Thu Oct 12 02:34:03 2000
++++ config_office/configure Fri Oct 13 17:52:25 2000
+@@ -739,7 +739,7 @@
+ echo $ac_n "checking the operating system""... $ac_c" 1>&6
+ echo "configure:741: checking the operating system" >&5
+ _os=`uname`
+-if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin"; then
++if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin" -o "$_os" = "FreeBSD"; then
+ echo "$ac_t""checked ($_os)" 1>&6
+ else
+ { echo "configure: error: $_os operating system is not suitable to build OpenOffice!" 1>&2; exit 1; }
diff --git a/editors/openoffice.org-2-devel/files/patch-set_soenv.1 b/editors/openoffice.org-2-devel/files/patch-set_soenv.1
new file mode 100644
index 000000000000..d18d3038c06b
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-set_soenv.1
@@ -0,0 +1,218 @@
+--- config_office/set_soenv.1.orig Thu Oct 12 10:16:28 2000
++++ config_office/set_soenv.1 Sun Oct 15 23:12:53 2000
+@@ -11,7 +11,7 @@
+ # Description:
+ # set_soenv generates a file that contains all necessary
+ # environment variables for the build proces of OpenOffice
+-# on Linux, Solaris, Windows NT and Macosx.
++# on Linux, Solaris, FreeBSD, Windows NT and Macosx.
+ # This script prompts the installer to enter:
+ # 1. (if necessary) The directory where the jdk is located (JAVA_HOME).
+ # 2. (if necessary) The directory where the Microsoft C/C++ compiler is located (COMPATH).
+@@ -53,7 +53,7 @@
+ #--------------------------------------------------------
+ #
+ my ( $outfile, $bootfile, $newline, $comment, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,
+- $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $Winnt, $Macosx, $WScomp,
++ $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Freebsd, $Linux, $Winnt, $Macosx, $WScomp,
+ $GNUcomp, $platform, $machine_type, $empty, $no_jdk, $no_tcsh, $no_cl, $no_gcc, $no_gcc_home, $no_gcc_include,
+ $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $win_format_var);
+ #
+@@ -121,6 +121,7 @@
+ $L = " -L"; # library search path
+ $D = " -D"; # define search path
+ $Solaris = "SunOS"; # return of uname command on Solaris
++$Freebsd = "FreeBSD"; # return of uname command on FreeBSD
+ $Linux = "Linux"; # return of uname command on Linux
+ $Winnt = "WINNT"; # return of uname command on Windows NT
+ $Macosx = "Darwin"; # return of uname command on Macosx
+@@ -162,8 +163,8 @@
+ #
+ $platform = `uname`; # probing the platform
+ chomp( $platform );
+-if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) )
+-{ die "This script is only suitable for the Solaris, Linux, Windows NT or Macosx platform!\n";
++if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) ) && ( $platform ne $Freebsd )
++{ die "This script is only suitable for the Solaris, FreeBSD, Linux, Windows NT or Macosx platform!\n";
+ }
+ else
+ { if ( $platform eq $Solaris )
+@@ -254,6 +255,54 @@
+ $PROSWITCH = "-DPRODUCT";
+ $XPVERSION = "3";
+ }
++elsif ( $platform eq "$Freebsd" )
++{ if ($machine_type eq "i686")
++ { print "Setting FreeBSD Intel specific values... ";
++ $outfile = "LinuxIntelEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "I";
++ $CPUNAME = "INTEL";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngi3";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ else
++ { if ($machine_type eq "alpha")
++ { print "Setting FreeBSD/Alpha specific values... ";
++ $outfile = "FreeBSDAlphaEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "S";
++ $CPUNAME = "ALPHA";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngs";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ }
++}
+ elsif ( $platform eq "$Linux" )
+ { if ($machine_type eq "i686")
+ { print "Setting Linux Intel specific values... ";
+@@ -430,7 +479,7 @@
+ }
+ # 4. Gcc path.
+ # Check whether autoconf found the compiler path.
+-if ($platform eq $Linux)
++if ($platform eq $Linux) -o ($platform eq $Freebsd)
+ { if ( $ARGV[ 0 ] eq $no_gcc)
+ { AddWarning( "set_soenv", "Autoconf did not find correct gcc compiler, prompted for value" );
+ printf "Did you build gcc 2.95.2 from source using the --prefix and --enable-shared flags (y/n)?: ";
+@@ -643,6 +692,13 @@
+ $ps.$par_dir.$LIB.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $LD_LIBRARY_PATH = $cur_dir.
++ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
++ $ps.$USR_LOCAL.$LIB.
++ $ps.$par_dir.$LIB.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $LD_LIBRARY_PATH = $cur_dir.
+ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
+@@ -681,6 +737,21 @@
+ $D."PRODUCT".
+ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARDEF = '"'.$D."UNX".
++ $D.$COM.
++ $D.$CVER.
++ $D.$GVER.
++ $D."_PTHREADS".
++ $D.$OS.
++ $D.$CPUNAME.
++ $D."X86".
++ $D."_REENTRANT".
++ $D."_POSIX_PTHREAD_SEMANTICS".
++ $D."SUPD=$UPD".
++ $D."PRODUCT".
++ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARDEF = '"'.$D."UNX".
+ $D.$COM.
+@@ -707,6 +778,12 @@
+ $L.$USR_DT.$LIB.
+ $L.$USR_OPENWIN.$LIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
++ $L.$LIB.
++ $L.$USR.$LIB.
++ $L.$USR.$LOCAL.$LIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
+ $L.$LIB.
+@@ -721,6 +798,9 @@
+ if ($platform eq "$Solaris")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
+@@ -790,6 +870,20 @@
+ $ps.$USR_DT.$BIN.
+ $ps.$USR.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $PATH = $cur_dir.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
++ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
++ $ps.'$SOLARENV'.$BIN.
++ $ps.'$JAVA_HOME'.$BIN;
++
++ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
++
++ $PATH .= $ps.$USR.$ds."sbin".
++ $ps.$ETC.
++ $ps.$USR.$BIN.$ds."X11".
++ $ps.$USR.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $PATH = $cur_dir.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
+@@ -861,6 +955,17 @@
+ $L.'$JAVA_HOME'.$LIB.
+ $L.$XLIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARLIB = '"'.$L.$par_dir.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.$LIB.
++ $L.$USR_LIB.
++ $L.$USR_LOCAL.$LIB.
++ $L.'$JAVA_HOME'.$LIB.
++ $L.$XLIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARLIB = '"'.$L.$par_dir.$LIB.
+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+@@ -898,6 +1003,16 @@
+ $I.'$JAVA_HOME'.$INCLUDE.
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."solaris".
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".'"';
++}
++elsif ($platform eq "$Freebsd")
++{ $SOLARINC .= $I.$GXX_INCLUDE.
++ $I.'$SOLARENV'.$INC.$ds."Xp31".
++ $I.'$JAVA_HOME'.$INCLUDE.
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."linux".
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".
++ $I.$XINC.
++ $I.$GCC_INCLUDE.
++ $I.$USR.$INCLUDE.'"';
+ }
+ elsif ($platform eq "$Linux")
+ { $SOLARINC .= $I.$GXX_INCLUDE.
diff --git a/editors/openoffice.org-2.0-devel/Makefile b/editors/openoffice.org-2.0-devel/Makefile
index d510844e3a06..664b4dc13769 100644
--- a/editors/openoffice.org-2.0-devel/Makefile
+++ b/editors/openoffice.org-2.0-devel/Makefile
@@ -1,3 +1,4 @@
+# ex:ts=8
# New ports collection makefile for: StarOffice 5.2
# Date created: 22 August 2000
# Whom: Martin Blapp
@@ -5,91 +6,18 @@
# $FreeBSD$
#
-PORTNAME= staroffice
-PORTVERSION= 5.2
-CATEGORIES= editors linux
-MASTER_SITES= ftp://ftp.inf.utfsm.cl/pub/UTFSM/StarOffice_5.2/ \
- ftp://ftp.snerpa.is/pub/linux/ \
- ftp://ftp.osb.hu/pub/mirrors/staroffice/linux/ \
- ftp://ftp.uni-linz.ac.at/pub/staroffice_5.2/ \
- ftp://ftp.labyrinth.net.au/.5/kk/linux/star_office/ \
- ftp://ftp.acs.oakland.edu/files/Linux/StarOffice/office52/ \
- ftp://ftp.ctio.noao.edu/linux/ \
- ftp://sunsite.cnlab-switch.ch/mirror/staroffice/english/ \
- ftp://ftp.linux.tucows.com/pub/Linuxberg/ \
- ftp://ftp.jcu.edu.au/pub/StarOffice/ \
- ftp://ftp.uakom.sk/pub/mirrors/StarOffice/ \
- ftp://ftp.linux.hr/pub/staroffice/5.2/
-DISTNAME= so-5_2-ga-bin-linux-en.bin
-DISTFILES= soa-5_2-ga-bin-linux-en.bin so-5_2-ga-bin-linux-en.bin
-EXTRACT_ONLY=
+PORTNAME= openoffice
+PORTVERSION= 6.0.a605
+CATEGORIES= editors
+MASTER_SITES= http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
+DISTNAME= oo_605_src
-MAINTAINER= mb@imp.ch
+MAINTAINER= obrien@FreeBSD.org
-FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-
-ONLY_FOR_ARCHS= i386
-NO_CDROM= 'Must be downloaded direct from Sun via www interface'
-IS_INTERACTIVE= yes
-NO_BUILD= yes
-DIST_SUBDIR= staroffice52
-WRKSRC= ${WRKDIR}/office52
-TMPDIR= ${WRKDIR}/tmp
-LD_PATH= ${TMPDIR}:${WRKSRC}:${LINUXBASE}/lib:${LINUXBASE}/usr/lib
+CONFIGURE_WRKSRC= ${WRKSRC}/config_office
.include <bsd.port.pre.mk>
-pre-fetch:
-.if ${OSVERSION} < 410000
- @${ECHO}
- @${ECHO} OS-VERSION ${OSVERSION}
- @${ECHO}
- @${ECHO} Staroffice depends on a scripting fix for
- @${ECHO} /usr/src/sys/i386/linux/linux_sysvec.c
- @${ECHO} \(revision 1.55.2.1 or higher\)
- @${ECHO}
- @${ECHO} Please upgrade to FreeBSD 4.1
- @${ECHO}
- @${FALSE}
-.endif
-.if defined(WITH_CDROM)
-.if !exists(${CD_MOUNTPT}/linux/office52/setup)
- @${ECHO}
- @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
- @${ECHO} onto /cdrom and run make again.
- @${ECHO}
- @${FALSE}
-.endif
-.endif
-
-.if defined(WITH_CDROM)
-do-extract:
- @${MKDIR} ${WRKSRC}/office52
- @cd ${WRKSRC}/office52 && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
-.endif
-
-do-extract:
-.if !defined(DISPLAY) || ${DISPLAY} == ""
- @ ${ECHO}
- @ ${ECHO} Can\'t open display:
- @ ${ECHO} Please check your DISPLAY variable.
- @ ${ECHO}
- @ ${FALSE}
-.else
- @${MKDIR} ${WRKSRC}
- @${MKDIR} ${TMPDIR}
- @${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC}
- @${CP} ${_DISTDIR}/soa-5_2-ga-bin-linux-en.bin ${WRKSRC}
- @${CHMOD} 755 ${WRKSRC}/${DISTNAME}
- @${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
- @cd ${WRKSRC}
- @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
- @cd ../../
-.endif
-
-post-configure:
- @${PERL} -pi.orig -e 's|DefaultDestPath = "office52";|DefaultDestPath = "${PREFIX}/office52";|' ${WRKSRC}/setup.ins
-
do-install:
.if !defined(DISPLAY) || ${DISPLAY} == ""
@ ${ECHO}
diff --git a/editors/openoffice.org-2.0-devel/distinfo b/editors/openoffice.org-2.0-devel/distinfo
index f1e7894f7587..bc002ffc38b1 100644
--- a/editors/openoffice.org-2.0-devel/distinfo
+++ b/editors/openoffice.org-2.0-devel/distinfo
@@ -1,2 +1 @@
-MD5 (staroffice52/soa-5_2-ga-bin-linux-en.bin) = 8f36a55d7cefd919febdefb502ae986d
-MD5 (staroffice52/so-5_2-ga-bin-linux-en.bin) = 1f03de10b6127772ba87567d334aeb4d
+MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
diff --git a/editors/openoffice.org-2.0-devel/files/patch-bootstrap.1 b/editors/openoffice.org-2.0-devel/files/patch-bootstrap.1
new file mode 100644
index 000000000000..fc625e321cca
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-bootstrap.1
@@ -0,0 +1,11 @@
+--- config_office/bootstrap.1.orig Mon Sep 18 09:13:24 2000
++++ config_office/bootstrap.1 Fri Oct 13 17:51:37 2000
+@@ -9,6 +9,8 @@
+ make linux
+ else if ($platform == "Darwin") then
+ make macosx
++else if ($platform == "FreeBSD") then
++ make linux
+ endif
+
+ if "$?" != "0" exit
diff --git a/editors/openoffice.org-2.0-devel/files/patch-configure b/editors/openoffice.org-2.0-devel/files/patch-configure
new file mode 100644
index 000000000000..744225fe9d31
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-configure
@@ -0,0 +1,11 @@
+--- config_office/configure.orig Thu Oct 12 02:34:03 2000
++++ config_office/configure Fri Oct 13 17:52:25 2000
+@@ -739,7 +739,7 @@
+ echo $ac_n "checking the operating system""... $ac_c" 1>&6
+ echo "configure:741: checking the operating system" >&5
+ _os=`uname`
+-if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin"; then
++if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin" -o "$_os" = "FreeBSD"; then
+ echo "$ac_t""checked ($_os)" 1>&6
+ else
+ { echo "configure: error: $_os operating system is not suitable to build OpenOffice!" 1>&2; exit 1; }
diff --git a/editors/openoffice.org-2.0-devel/files/patch-set_soenv.1 b/editors/openoffice.org-2.0-devel/files/patch-set_soenv.1
new file mode 100644
index 000000000000..d18d3038c06b
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-set_soenv.1
@@ -0,0 +1,218 @@
+--- config_office/set_soenv.1.orig Thu Oct 12 10:16:28 2000
++++ config_office/set_soenv.1 Sun Oct 15 23:12:53 2000
+@@ -11,7 +11,7 @@
+ # Description:
+ # set_soenv generates a file that contains all necessary
+ # environment variables for the build proces of OpenOffice
+-# on Linux, Solaris, Windows NT and Macosx.
++# on Linux, Solaris, FreeBSD, Windows NT and Macosx.
+ # This script prompts the installer to enter:
+ # 1. (if necessary) The directory where the jdk is located (JAVA_HOME).
+ # 2. (if necessary) The directory where the Microsoft C/C++ compiler is located (COMPATH).
+@@ -53,7 +53,7 @@
+ #--------------------------------------------------------
+ #
+ my ( $outfile, $bootfile, $newline, $comment, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,
+- $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $Winnt, $Macosx, $WScomp,
++ $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Freebsd, $Linux, $Winnt, $Macosx, $WScomp,
+ $GNUcomp, $platform, $machine_type, $empty, $no_jdk, $no_tcsh, $no_cl, $no_gcc, $no_gcc_home, $no_gcc_include,
+ $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $win_format_var);
+ #
+@@ -121,6 +121,7 @@
+ $L = " -L"; # library search path
+ $D = " -D"; # define search path
+ $Solaris = "SunOS"; # return of uname command on Solaris
++$Freebsd = "FreeBSD"; # return of uname command on FreeBSD
+ $Linux = "Linux"; # return of uname command on Linux
+ $Winnt = "WINNT"; # return of uname command on Windows NT
+ $Macosx = "Darwin"; # return of uname command on Macosx
+@@ -162,8 +163,8 @@
+ #
+ $platform = `uname`; # probing the platform
+ chomp( $platform );
+-if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) )
+-{ die "This script is only suitable for the Solaris, Linux, Windows NT or Macosx platform!\n";
++if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) ) && ( $platform ne $Freebsd )
++{ die "This script is only suitable for the Solaris, FreeBSD, Linux, Windows NT or Macosx platform!\n";
+ }
+ else
+ { if ( $platform eq $Solaris )
+@@ -254,6 +255,54 @@
+ $PROSWITCH = "-DPRODUCT";
+ $XPVERSION = "3";
+ }
++elsif ( $platform eq "$Freebsd" )
++{ if ($machine_type eq "i686")
++ { print "Setting FreeBSD Intel specific values... ";
++ $outfile = "LinuxIntelEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "I";
++ $CPUNAME = "INTEL";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngi3";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ else
++ { if ($machine_type eq "alpha")
++ { print "Setting FreeBSD/Alpha specific values... ";
++ $outfile = "FreeBSDAlphaEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "S";
++ $CPUNAME = "ALPHA";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngs";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ }
++}
+ elsif ( $platform eq "$Linux" )
+ { if ($machine_type eq "i686")
+ { print "Setting Linux Intel specific values... ";
+@@ -430,7 +479,7 @@
+ }
+ # 4. Gcc path.
+ # Check whether autoconf found the compiler path.
+-if ($platform eq $Linux)
++if ($platform eq $Linux) -o ($platform eq $Freebsd)
+ { if ( $ARGV[ 0 ] eq $no_gcc)
+ { AddWarning( "set_soenv", "Autoconf did not find correct gcc compiler, prompted for value" );
+ printf "Did you build gcc 2.95.2 from source using the --prefix and --enable-shared flags (y/n)?: ";
+@@ -643,6 +692,13 @@
+ $ps.$par_dir.$LIB.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $LD_LIBRARY_PATH = $cur_dir.
++ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
++ $ps.$USR_LOCAL.$LIB.
++ $ps.$par_dir.$LIB.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $LD_LIBRARY_PATH = $cur_dir.
+ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
+@@ -681,6 +737,21 @@
+ $D."PRODUCT".
+ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARDEF = '"'.$D."UNX".
++ $D.$COM.
++ $D.$CVER.
++ $D.$GVER.
++ $D."_PTHREADS".
++ $D.$OS.
++ $D.$CPUNAME.
++ $D."X86".
++ $D."_REENTRANT".
++ $D."_POSIX_PTHREAD_SEMANTICS".
++ $D."SUPD=$UPD".
++ $D."PRODUCT".
++ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARDEF = '"'.$D."UNX".
+ $D.$COM.
+@@ -707,6 +778,12 @@
+ $L.$USR_DT.$LIB.
+ $L.$USR_OPENWIN.$LIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
++ $L.$LIB.
++ $L.$USR.$LIB.
++ $L.$USR.$LOCAL.$LIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
+ $L.$LIB.
+@@ -721,6 +798,9 @@
+ if ($platform eq "$Solaris")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
+@@ -790,6 +870,20 @@
+ $ps.$USR_DT.$BIN.
+ $ps.$USR.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $PATH = $cur_dir.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
++ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
++ $ps.'$SOLARENV'.$BIN.
++ $ps.'$JAVA_HOME'.$BIN;
++
++ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
++
++ $PATH .= $ps.$USR.$ds."sbin".
++ $ps.$ETC.
++ $ps.$USR.$BIN.$ds."X11".
++ $ps.$USR.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $PATH = $cur_dir.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
+@@ -861,6 +955,17 @@
+ $L.'$JAVA_HOME'.$LIB.
+ $L.$XLIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARLIB = '"'.$L.$par_dir.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.$LIB.
++ $L.$USR_LIB.
++ $L.$USR_LOCAL.$LIB.
++ $L.'$JAVA_HOME'.$LIB.
++ $L.$XLIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARLIB = '"'.$L.$par_dir.$LIB.
+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+@@ -898,6 +1003,16 @@
+ $I.'$JAVA_HOME'.$INCLUDE.
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."solaris".
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".'"';
++}
++elsif ($platform eq "$Freebsd")
++{ $SOLARINC .= $I.$GXX_INCLUDE.
++ $I.'$SOLARENV'.$INC.$ds."Xp31".
++ $I.'$JAVA_HOME'.$INCLUDE.
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."linux".
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".
++ $I.$XINC.
++ $I.$GCC_INCLUDE.
++ $I.$USR.$INCLUDE.'"';
+ }
+ elsif ($platform eq "$Linux")
+ { $SOLARINC .= $I.$GXX_INCLUDE.
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile
index d510844e3a06..664b4dc13769 100644
--- a/editors/openoffice.org-2.0/Makefile
+++ b/editors/openoffice.org-2.0/Makefile
@@ -1,3 +1,4 @@
+# ex:ts=8
# New ports collection makefile for: StarOffice 5.2
# Date created: 22 August 2000
# Whom: Martin Blapp
@@ -5,91 +6,18 @@
# $FreeBSD$
#
-PORTNAME= staroffice
-PORTVERSION= 5.2
-CATEGORIES= editors linux
-MASTER_SITES= ftp://ftp.inf.utfsm.cl/pub/UTFSM/StarOffice_5.2/ \
- ftp://ftp.snerpa.is/pub/linux/ \
- ftp://ftp.osb.hu/pub/mirrors/staroffice/linux/ \
- ftp://ftp.uni-linz.ac.at/pub/staroffice_5.2/ \
- ftp://ftp.labyrinth.net.au/.5/kk/linux/star_office/ \
- ftp://ftp.acs.oakland.edu/files/Linux/StarOffice/office52/ \
- ftp://ftp.ctio.noao.edu/linux/ \
- ftp://sunsite.cnlab-switch.ch/mirror/staroffice/english/ \
- ftp://ftp.linux.tucows.com/pub/Linuxberg/ \
- ftp://ftp.jcu.edu.au/pub/StarOffice/ \
- ftp://ftp.uakom.sk/pub/mirrors/StarOffice/ \
- ftp://ftp.linux.hr/pub/staroffice/5.2/
-DISTNAME= so-5_2-ga-bin-linux-en.bin
-DISTFILES= soa-5_2-ga-bin-linux-en.bin so-5_2-ga-bin-linux-en.bin
-EXTRACT_ONLY=
+PORTNAME= openoffice
+PORTVERSION= 6.0.a605
+CATEGORIES= editors
+MASTER_SITES= http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
+DISTNAME= oo_605_src
-MAINTAINER= mb@imp.ch
+MAINTAINER= obrien@FreeBSD.org
-FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-
-ONLY_FOR_ARCHS= i386
-NO_CDROM= 'Must be downloaded direct from Sun via www interface'
-IS_INTERACTIVE= yes
-NO_BUILD= yes
-DIST_SUBDIR= staroffice52
-WRKSRC= ${WRKDIR}/office52
-TMPDIR= ${WRKDIR}/tmp
-LD_PATH= ${TMPDIR}:${WRKSRC}:${LINUXBASE}/lib:${LINUXBASE}/usr/lib
+CONFIGURE_WRKSRC= ${WRKSRC}/config_office
.include <bsd.port.pre.mk>
-pre-fetch:
-.if ${OSVERSION} < 410000
- @${ECHO}
- @${ECHO} OS-VERSION ${OSVERSION}
- @${ECHO}
- @${ECHO} Staroffice depends on a scripting fix for
- @${ECHO} /usr/src/sys/i386/linux/linux_sysvec.c
- @${ECHO} \(revision 1.55.2.1 or higher\)
- @${ECHO}
- @${ECHO} Please upgrade to FreeBSD 4.1
- @${ECHO}
- @${FALSE}
-.endif
-.if defined(WITH_CDROM)
-.if !exists(${CD_MOUNTPT}/linux/office52/setup)
- @${ECHO}
- @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
- @${ECHO} onto /cdrom and run make again.
- @${ECHO}
- @${FALSE}
-.endif
-.endif
-
-.if defined(WITH_CDROM)
-do-extract:
- @${MKDIR} ${WRKSRC}/office52
- @cd ${WRKSRC}/office52 && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
-.endif
-
-do-extract:
-.if !defined(DISPLAY) || ${DISPLAY} == ""
- @ ${ECHO}
- @ ${ECHO} Can\'t open display:
- @ ${ECHO} Please check your DISPLAY variable.
- @ ${ECHO}
- @ ${FALSE}
-.else
- @${MKDIR} ${WRKSRC}
- @${MKDIR} ${TMPDIR}
- @${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC}
- @${CP} ${_DISTDIR}/soa-5_2-ga-bin-linux-en.bin ${WRKSRC}
- @${CHMOD} 755 ${WRKSRC}/${DISTNAME}
- @${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
- @cd ${WRKSRC}
- @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
- @cd ../../
-.endif
-
-post-configure:
- @${PERL} -pi.orig -e 's|DefaultDestPath = "office52";|DefaultDestPath = "${PREFIX}/office52";|' ${WRKSRC}/setup.ins
-
do-install:
.if !defined(DISPLAY) || ${DISPLAY} == ""
@ ${ECHO}
diff --git a/editors/openoffice.org-2.0/distinfo b/editors/openoffice.org-2.0/distinfo
index f1e7894f7587..bc002ffc38b1 100644
--- a/editors/openoffice.org-2.0/distinfo
+++ b/editors/openoffice.org-2.0/distinfo
@@ -1,2 +1 @@
-MD5 (staroffice52/soa-5_2-ga-bin-linux-en.bin) = 8f36a55d7cefd919febdefb502ae986d
-MD5 (staroffice52/so-5_2-ga-bin-linux-en.bin) = 1f03de10b6127772ba87567d334aeb4d
+MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
diff --git a/editors/openoffice.org-2.0/files/patch-bootstrap.1 b/editors/openoffice.org-2.0/files/patch-bootstrap.1
new file mode 100644
index 000000000000..fc625e321cca
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-bootstrap.1
@@ -0,0 +1,11 @@
+--- config_office/bootstrap.1.orig Mon Sep 18 09:13:24 2000
++++ config_office/bootstrap.1 Fri Oct 13 17:51:37 2000
+@@ -9,6 +9,8 @@
+ make linux
+ else if ($platform == "Darwin") then
+ make macosx
++else if ($platform == "FreeBSD") then
++ make linux
+ endif
+
+ if "$?" != "0" exit
diff --git a/editors/openoffice.org-2.0/files/patch-configure b/editors/openoffice.org-2.0/files/patch-configure
new file mode 100644
index 000000000000..744225fe9d31
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-configure
@@ -0,0 +1,11 @@
+--- config_office/configure.orig Thu Oct 12 02:34:03 2000
++++ config_office/configure Fri Oct 13 17:52:25 2000
+@@ -739,7 +739,7 @@
+ echo $ac_n "checking the operating system""... $ac_c" 1>&6
+ echo "configure:741: checking the operating system" >&5
+ _os=`uname`
+-if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin"; then
++if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin" -o "$_os" = "FreeBSD"; then
+ echo "$ac_t""checked ($_os)" 1>&6
+ else
+ { echo "configure: error: $_os operating system is not suitable to build OpenOffice!" 1>&2; exit 1; }
diff --git a/editors/openoffice.org-2.0/files/patch-set_soenv.1 b/editors/openoffice.org-2.0/files/patch-set_soenv.1
new file mode 100644
index 000000000000..d18d3038c06b
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-set_soenv.1
@@ -0,0 +1,218 @@
+--- config_office/set_soenv.1.orig Thu Oct 12 10:16:28 2000
++++ config_office/set_soenv.1 Sun Oct 15 23:12:53 2000
+@@ -11,7 +11,7 @@
+ # Description:
+ # set_soenv generates a file that contains all necessary
+ # environment variables for the build proces of OpenOffice
+-# on Linux, Solaris, Windows NT and Macosx.
++# on Linux, Solaris, FreeBSD, Windows NT and Macosx.
+ # This script prompts the installer to enter:
+ # 1. (if necessary) The directory where the jdk is located (JAVA_HOME).
+ # 2. (if necessary) The directory where the Microsoft C/C++ compiler is located (COMPATH).
+@@ -53,7 +53,7 @@
+ #--------------------------------------------------------
+ #
+ my ( $outfile, $bootfile, $newline, $comment, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,
+- $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $Winnt, $Macosx, $WScomp,
++ $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Freebsd, $Linux, $Winnt, $Macosx, $WScomp,
+ $GNUcomp, $platform, $machine_type, $empty, $no_jdk, $no_tcsh, $no_cl, $no_gcc, $no_gcc_home, $no_gcc_include,
+ $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $win_format_var);
+ #
+@@ -121,6 +121,7 @@
+ $L = " -L"; # library search path
+ $D = " -D"; # define search path
+ $Solaris = "SunOS"; # return of uname command on Solaris
++$Freebsd = "FreeBSD"; # return of uname command on FreeBSD
+ $Linux = "Linux"; # return of uname command on Linux
+ $Winnt = "WINNT"; # return of uname command on Windows NT
+ $Macosx = "Darwin"; # return of uname command on Macosx
+@@ -162,8 +163,8 @@
+ #
+ $platform = `uname`; # probing the platform
+ chomp( $platform );
+-if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) )
+-{ die "This script is only suitable for the Solaris, Linux, Windows NT or Macosx platform!\n";
++if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) ) && ( $platform ne $Freebsd )
++{ die "This script is only suitable for the Solaris, FreeBSD, Linux, Windows NT or Macosx platform!\n";
+ }
+ else
+ { if ( $platform eq $Solaris )
+@@ -254,6 +255,54 @@
+ $PROSWITCH = "-DPRODUCT";
+ $XPVERSION = "3";
+ }
++elsif ( $platform eq "$Freebsd" )
++{ if ($machine_type eq "i686")
++ { print "Setting FreeBSD Intel specific values... ";
++ $outfile = "LinuxIntelEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "I";
++ $CPUNAME = "INTEL";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngi3";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ else
++ { if ($machine_type eq "alpha")
++ { print "Setting FreeBSD/Alpha specific values... ";
++ $outfile = "FreeBSDAlphaEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "S";
++ $CPUNAME = "ALPHA";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngs";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ }
++}
+ elsif ( $platform eq "$Linux" )
+ { if ($machine_type eq "i686")
+ { print "Setting Linux Intel specific values... ";
+@@ -430,7 +479,7 @@
+ }
+ # 4. Gcc path.
+ # Check whether autoconf found the compiler path.
+-if ($platform eq $Linux)
++if ($platform eq $Linux) -o ($platform eq $Freebsd)
+ { if ( $ARGV[ 0 ] eq $no_gcc)
+ { AddWarning( "set_soenv", "Autoconf did not find correct gcc compiler, prompted for value" );
+ printf "Did you build gcc 2.95.2 from source using the --prefix and --enable-shared flags (y/n)?: ";
+@@ -643,6 +692,13 @@
+ $ps.$par_dir.$LIB.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $LD_LIBRARY_PATH = $cur_dir.
++ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
++ $ps.$USR_LOCAL.$LIB.
++ $ps.$par_dir.$LIB.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $LD_LIBRARY_PATH = $cur_dir.
+ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
+@@ -681,6 +737,21 @@
+ $D."PRODUCT".
+ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARDEF = '"'.$D."UNX".
++ $D.$COM.
++ $D.$CVER.
++ $D.$GVER.
++ $D."_PTHREADS".
++ $D.$OS.
++ $D.$CPUNAME.
++ $D."X86".
++ $D."_REENTRANT".
++ $D."_POSIX_PTHREAD_SEMANTICS".
++ $D."SUPD=$UPD".
++ $D."PRODUCT".
++ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARDEF = '"'.$D."UNX".
+ $D.$COM.
+@@ -707,6 +778,12 @@
+ $L.$USR_DT.$LIB.
+ $L.$USR_OPENWIN.$LIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
++ $L.$LIB.
++ $L.$USR.$LIB.
++ $L.$USR.$LOCAL.$LIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
+ $L.$LIB.
+@@ -721,6 +798,9 @@
+ if ($platform eq "$Solaris")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
+@@ -790,6 +870,20 @@
+ $ps.$USR_DT.$BIN.
+ $ps.$USR.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $PATH = $cur_dir.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
++ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
++ $ps.'$SOLARENV'.$BIN.
++ $ps.'$JAVA_HOME'.$BIN;
++
++ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
++
++ $PATH .= $ps.$USR.$ds."sbin".
++ $ps.$ETC.
++ $ps.$USR.$BIN.$ds."X11".
++ $ps.$USR.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $PATH = $cur_dir.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
+@@ -861,6 +955,17 @@
+ $L.'$JAVA_HOME'.$LIB.
+ $L.$XLIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARLIB = '"'.$L.$par_dir.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.$LIB.
++ $L.$USR_LIB.
++ $L.$USR_LOCAL.$LIB.
++ $L.'$JAVA_HOME'.$LIB.
++ $L.$XLIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARLIB = '"'.$L.$par_dir.$LIB.
+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+@@ -898,6 +1003,16 @@
+ $I.'$JAVA_HOME'.$INCLUDE.
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."solaris".
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".'"';
++}
++elsif ($platform eq "$Freebsd")
++{ $SOLARINC .= $I.$GXX_INCLUDE.
++ $I.'$SOLARENV'.$INC.$ds."Xp31".
++ $I.'$JAVA_HOME'.$INCLUDE.
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."linux".
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".
++ $I.$XINC.
++ $I.$GCC_INCLUDE.
++ $I.$USR.$INCLUDE.'"';
+ }
+ elsif ($platform eq "$Linux")
+ { $SOLARINC .= $I.$GXX_INCLUDE.
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index d510844e3a06..664b4dc13769 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -1,3 +1,4 @@
+# ex:ts=8
# New ports collection makefile for: StarOffice 5.2
# Date created: 22 August 2000
# Whom: Martin Blapp
@@ -5,91 +6,18 @@
# $FreeBSD$
#
-PORTNAME= staroffice
-PORTVERSION= 5.2
-CATEGORIES= editors linux
-MASTER_SITES= ftp://ftp.inf.utfsm.cl/pub/UTFSM/StarOffice_5.2/ \
- ftp://ftp.snerpa.is/pub/linux/ \
- ftp://ftp.osb.hu/pub/mirrors/staroffice/linux/ \
- ftp://ftp.uni-linz.ac.at/pub/staroffice_5.2/ \
- ftp://ftp.labyrinth.net.au/.5/kk/linux/star_office/ \
- ftp://ftp.acs.oakland.edu/files/Linux/StarOffice/office52/ \
- ftp://ftp.ctio.noao.edu/linux/ \
- ftp://sunsite.cnlab-switch.ch/mirror/staroffice/english/ \
- ftp://ftp.linux.tucows.com/pub/Linuxberg/ \
- ftp://ftp.jcu.edu.au/pub/StarOffice/ \
- ftp://ftp.uakom.sk/pub/mirrors/StarOffice/ \
- ftp://ftp.linux.hr/pub/staroffice/5.2/
-DISTNAME= so-5_2-ga-bin-linux-en.bin
-DISTFILES= soa-5_2-ga-bin-linux-en.bin so-5_2-ga-bin-linux-en.bin
-EXTRACT_ONLY=
+PORTNAME= openoffice
+PORTVERSION= 6.0.a605
+CATEGORIES= editors
+MASTER_SITES= http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
+DISTNAME= oo_605_src
-MAINTAINER= mb@imp.ch
+MAINTAINER= obrien@FreeBSD.org
-FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-
-ONLY_FOR_ARCHS= i386
-NO_CDROM= 'Must be downloaded direct from Sun via www interface'
-IS_INTERACTIVE= yes
-NO_BUILD= yes
-DIST_SUBDIR= staroffice52
-WRKSRC= ${WRKDIR}/office52
-TMPDIR= ${WRKDIR}/tmp
-LD_PATH= ${TMPDIR}:${WRKSRC}:${LINUXBASE}/lib:${LINUXBASE}/usr/lib
+CONFIGURE_WRKSRC= ${WRKSRC}/config_office
.include <bsd.port.pre.mk>
-pre-fetch:
-.if ${OSVERSION} < 410000
- @${ECHO}
- @${ECHO} OS-VERSION ${OSVERSION}
- @${ECHO}
- @${ECHO} Staroffice depends on a scripting fix for
- @${ECHO} /usr/src/sys/i386/linux/linux_sysvec.c
- @${ECHO} \(revision 1.55.2.1 or higher\)
- @${ECHO}
- @${ECHO} Please upgrade to FreeBSD 4.1
- @${ECHO}
- @${FALSE}
-.endif
-.if defined(WITH_CDROM)
-.if !exists(${CD_MOUNTPT}/linux/office52/setup)
- @${ECHO}
- @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
- @${ECHO} onto /cdrom and run make again.
- @${ECHO}
- @${FALSE}
-.endif
-.endif
-
-.if defined(WITH_CDROM)
-do-extract:
- @${MKDIR} ${WRKSRC}/office52
- @cd ${WRKSRC}/office52 && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
-.endif
-
-do-extract:
-.if !defined(DISPLAY) || ${DISPLAY} == ""
- @ ${ECHO}
- @ ${ECHO} Can\'t open display:
- @ ${ECHO} Please check your DISPLAY variable.
- @ ${ECHO}
- @ ${FALSE}
-.else
- @${MKDIR} ${WRKSRC}
- @${MKDIR} ${TMPDIR}
- @${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC}
- @${CP} ${_DISTDIR}/soa-5_2-ga-bin-linux-en.bin ${WRKSRC}
- @${CHMOD} 755 ${WRKSRC}/${DISTNAME}
- @${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
- @cd ${WRKSRC}
- @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
- @cd ../../
-.endif
-
-post-configure:
- @${PERL} -pi.orig -e 's|DefaultDestPath = "office52";|DefaultDestPath = "${PREFIX}/office52";|' ${WRKSRC}/setup.ins
-
do-install:
.if !defined(DISPLAY) || ${DISPLAY} == ""
@ ${ECHO}
diff --git a/editors/openoffice.org-2/distinfo b/editors/openoffice.org-2/distinfo
index f1e7894f7587..bc002ffc38b1 100644
--- a/editors/openoffice.org-2/distinfo
+++ b/editors/openoffice.org-2/distinfo
@@ -1,2 +1 @@
-MD5 (staroffice52/soa-5_2-ga-bin-linux-en.bin) = 8f36a55d7cefd919febdefb502ae986d
-MD5 (staroffice52/so-5_2-ga-bin-linux-en.bin) = 1f03de10b6127772ba87567d334aeb4d
+MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
diff --git a/editors/openoffice.org-2/files/patch-bootstrap.1 b/editors/openoffice.org-2/files/patch-bootstrap.1
new file mode 100644
index 000000000000..fc625e321cca
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-bootstrap.1
@@ -0,0 +1,11 @@
+--- config_office/bootstrap.1.orig Mon Sep 18 09:13:24 2000
++++ config_office/bootstrap.1 Fri Oct 13 17:51:37 2000
+@@ -9,6 +9,8 @@
+ make linux
+ else if ($platform == "Darwin") then
+ make macosx
++else if ($platform == "FreeBSD") then
++ make linux
+ endif
+
+ if "$?" != "0" exit
diff --git a/editors/openoffice.org-2/files/patch-configure b/editors/openoffice.org-2/files/patch-configure
new file mode 100644
index 000000000000..744225fe9d31
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-configure
@@ -0,0 +1,11 @@
+--- config_office/configure.orig Thu Oct 12 02:34:03 2000
++++ config_office/configure Fri Oct 13 17:52:25 2000
+@@ -739,7 +739,7 @@
+ echo $ac_n "checking the operating system""... $ac_c" 1>&6
+ echo "configure:741: checking the operating system" >&5
+ _os=`uname`
+-if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin"; then
++if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin" -o "$_os" = "FreeBSD"; then
+ echo "$ac_t""checked ($_os)" 1>&6
+ else
+ { echo "configure: error: $_os operating system is not suitable to build OpenOffice!" 1>&2; exit 1; }
diff --git a/editors/openoffice.org-2/files/patch-set_soenv.1 b/editors/openoffice.org-2/files/patch-set_soenv.1
new file mode 100644
index 000000000000..d18d3038c06b
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-set_soenv.1
@@ -0,0 +1,218 @@
+--- config_office/set_soenv.1.orig Thu Oct 12 10:16:28 2000
++++ config_office/set_soenv.1 Sun Oct 15 23:12:53 2000
+@@ -11,7 +11,7 @@
+ # Description:
+ # set_soenv generates a file that contains all necessary
+ # environment variables for the build proces of OpenOffice
+-# on Linux, Solaris, Windows NT and Macosx.
++# on Linux, Solaris, FreeBSD, Windows NT and Macosx.
+ # This script prompts the installer to enter:
+ # 1. (if necessary) The directory where the jdk is located (JAVA_HOME).
+ # 2. (if necessary) The directory where the Microsoft C/C++ compiler is located (COMPATH).
+@@ -53,7 +53,7 @@
+ #--------------------------------------------------------
+ #
+ my ( $outfile, $bootfile, $newline, $comment, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,
+- $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $Winnt, $Macosx, $WScomp,
++ $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Freebsd, $Linux, $Winnt, $Macosx, $WScomp,
+ $GNUcomp, $platform, $machine_type, $empty, $no_jdk, $no_tcsh, $no_cl, $no_gcc, $no_gcc_home, $no_gcc_include,
+ $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $win_format_var);
+ #
+@@ -121,6 +121,7 @@
+ $L = " -L"; # library search path
+ $D = " -D"; # define search path
+ $Solaris = "SunOS"; # return of uname command on Solaris
++$Freebsd = "FreeBSD"; # return of uname command on FreeBSD
+ $Linux = "Linux"; # return of uname command on Linux
+ $Winnt = "WINNT"; # return of uname command on Windows NT
+ $Macosx = "Darwin"; # return of uname command on Macosx
+@@ -162,8 +163,8 @@
+ #
+ $platform = `uname`; # probing the platform
+ chomp( $platform );
+-if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) )
+-{ die "This script is only suitable for the Solaris, Linux, Windows NT or Macosx platform!\n";
++if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) ) && ( $platform ne $Freebsd )
++{ die "This script is only suitable for the Solaris, FreeBSD, Linux, Windows NT or Macosx platform!\n";
+ }
+ else
+ { if ( $platform eq $Solaris )
+@@ -254,6 +255,54 @@
+ $PROSWITCH = "-DPRODUCT";
+ $XPVERSION = "3";
+ }
++elsif ( $platform eq "$Freebsd" )
++{ if ($machine_type eq "i686")
++ { print "Setting FreeBSD Intel specific values... ";
++ $outfile = "LinuxIntelEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "I";
++ $CPUNAME = "INTEL";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngi3";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ else
++ { if ($machine_type eq "alpha")
++ { print "Setting FreeBSD/Alpha specific values... ";
++ $outfile = "FreeBSDAlphaEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "S";
++ $CPUNAME = "ALPHA";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngs";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ }
++}
+ elsif ( $platform eq "$Linux" )
+ { if ($machine_type eq "i686")
+ { print "Setting Linux Intel specific values... ";
+@@ -430,7 +479,7 @@
+ }
+ # 4. Gcc path.
+ # Check whether autoconf found the compiler path.
+-if ($platform eq $Linux)
++if ($platform eq $Linux) -o ($platform eq $Freebsd)
+ { if ( $ARGV[ 0 ] eq $no_gcc)
+ { AddWarning( "set_soenv", "Autoconf did not find correct gcc compiler, prompted for value" );
+ printf "Did you build gcc 2.95.2 from source using the --prefix and --enable-shared flags (y/n)?: ";
+@@ -643,6 +692,13 @@
+ $ps.$par_dir.$LIB.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $LD_LIBRARY_PATH = $cur_dir.
++ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
++ $ps.$USR_LOCAL.$LIB.
++ $ps.$par_dir.$LIB.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $LD_LIBRARY_PATH = $cur_dir.
+ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
+@@ -681,6 +737,21 @@
+ $D."PRODUCT".
+ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARDEF = '"'.$D."UNX".
++ $D.$COM.
++ $D.$CVER.
++ $D.$GVER.
++ $D."_PTHREADS".
++ $D.$OS.
++ $D.$CPUNAME.
++ $D."X86".
++ $D."_REENTRANT".
++ $D."_POSIX_PTHREAD_SEMANTICS".
++ $D."SUPD=$UPD".
++ $D."PRODUCT".
++ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARDEF = '"'.$D."UNX".
+ $D.$COM.
+@@ -707,6 +778,12 @@
+ $L.$USR_DT.$LIB.
+ $L.$USR_OPENWIN.$LIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
++ $L.$LIB.
++ $L.$USR.$LIB.
++ $L.$USR.$LOCAL.$LIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
+ $L.$LIB.
+@@ -721,6 +798,9 @@
+ if ($platform eq "$Solaris")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
+@@ -790,6 +870,20 @@
+ $ps.$USR_DT.$BIN.
+ $ps.$USR.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $PATH = $cur_dir.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
++ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
++ $ps.'$SOLARENV'.$BIN.
++ $ps.'$JAVA_HOME'.$BIN;
++
++ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
++
++ $PATH .= $ps.$USR.$ds."sbin".
++ $ps.$ETC.
++ $ps.$USR.$BIN.$ds."X11".
++ $ps.$USR.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $PATH = $cur_dir.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
+@@ -861,6 +955,17 @@
+ $L.'$JAVA_HOME'.$LIB.
+ $L.$XLIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARLIB = '"'.$L.$par_dir.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.$LIB.
++ $L.$USR_LIB.
++ $L.$USR_LOCAL.$LIB.
++ $L.'$JAVA_HOME'.$LIB.
++ $L.$XLIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARLIB = '"'.$L.$par_dir.$LIB.
+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+@@ -898,6 +1003,16 @@
+ $I.'$JAVA_HOME'.$INCLUDE.
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."solaris".
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".'"';
++}
++elsif ($platform eq "$Freebsd")
++{ $SOLARINC .= $I.$GXX_INCLUDE.
++ $I.'$SOLARENV'.$INC.$ds."Xp31".
++ $I.'$JAVA_HOME'.$INCLUDE.
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."linux".
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".
++ $I.$XINC.
++ $I.$GCC_INCLUDE.
++ $I.$USR.$INCLUDE.'"';
+ }
+ elsif ($platform eq "$Linux")
+ { $SOLARINC .= $I.$GXX_INCLUDE.
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index d510844e3a06..664b4dc13769 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -1,3 +1,4 @@
+# ex:ts=8
# New ports collection makefile for: StarOffice 5.2
# Date created: 22 August 2000
# Whom: Martin Blapp
@@ -5,91 +6,18 @@
# $FreeBSD$
#
-PORTNAME= staroffice
-PORTVERSION= 5.2
-CATEGORIES= editors linux
-MASTER_SITES= ftp://ftp.inf.utfsm.cl/pub/UTFSM/StarOffice_5.2/ \
- ftp://ftp.snerpa.is/pub/linux/ \
- ftp://ftp.osb.hu/pub/mirrors/staroffice/linux/ \
- ftp://ftp.uni-linz.ac.at/pub/staroffice_5.2/ \
- ftp://ftp.labyrinth.net.au/.5/kk/linux/star_office/ \
- ftp://ftp.acs.oakland.edu/files/Linux/StarOffice/office52/ \
- ftp://ftp.ctio.noao.edu/linux/ \
- ftp://sunsite.cnlab-switch.ch/mirror/staroffice/english/ \
- ftp://ftp.linux.tucows.com/pub/Linuxberg/ \
- ftp://ftp.jcu.edu.au/pub/StarOffice/ \
- ftp://ftp.uakom.sk/pub/mirrors/StarOffice/ \
- ftp://ftp.linux.hr/pub/staroffice/5.2/
-DISTNAME= so-5_2-ga-bin-linux-en.bin
-DISTFILES= soa-5_2-ga-bin-linux-en.bin so-5_2-ga-bin-linux-en.bin
-EXTRACT_ONLY=
+PORTNAME= openoffice
+PORTVERSION= 6.0.a605
+CATEGORIES= editors
+MASTER_SITES= http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
+DISTNAME= oo_605_src
-MAINTAINER= mb@imp.ch
+MAINTAINER= obrien@FreeBSD.org
-FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-
-ONLY_FOR_ARCHS= i386
-NO_CDROM= 'Must be downloaded direct from Sun via www interface'
-IS_INTERACTIVE= yes
-NO_BUILD= yes
-DIST_SUBDIR= staroffice52
-WRKSRC= ${WRKDIR}/office52
-TMPDIR= ${WRKDIR}/tmp
-LD_PATH= ${TMPDIR}:${WRKSRC}:${LINUXBASE}/lib:${LINUXBASE}/usr/lib
+CONFIGURE_WRKSRC= ${WRKSRC}/config_office
.include <bsd.port.pre.mk>
-pre-fetch:
-.if ${OSVERSION} < 410000
- @${ECHO}
- @${ECHO} OS-VERSION ${OSVERSION}
- @${ECHO}
- @${ECHO} Staroffice depends on a scripting fix for
- @${ECHO} /usr/src/sys/i386/linux/linux_sysvec.c
- @${ECHO} \(revision 1.55.2.1 or higher\)
- @${ECHO}
- @${ECHO} Please upgrade to FreeBSD 4.1
- @${ECHO}
- @${FALSE}
-.endif
-.if defined(WITH_CDROM)
-.if !exists(${CD_MOUNTPT}/linux/office52/setup)
- @${ECHO}
- @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
- @${ECHO} onto /cdrom and run make again.
- @${ECHO}
- @${FALSE}
-.endif
-.endif
-
-.if defined(WITH_CDROM)
-do-extract:
- @${MKDIR} ${WRKSRC}/office52
- @cd ${WRKSRC}/office52 && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
-.endif
-
-do-extract:
-.if !defined(DISPLAY) || ${DISPLAY} == ""
- @ ${ECHO}
- @ ${ECHO} Can\'t open display:
- @ ${ECHO} Please check your DISPLAY variable.
- @ ${ECHO}
- @ ${FALSE}
-.else
- @${MKDIR} ${WRKSRC}
- @${MKDIR} ${TMPDIR}
- @${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC}
- @${CP} ${_DISTDIR}/soa-5_2-ga-bin-linux-en.bin ${WRKSRC}
- @${CHMOD} 755 ${WRKSRC}/${DISTNAME}
- @${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
- @cd ${WRKSRC}
- @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
- @cd ../../
-.endif
-
-post-configure:
- @${PERL} -pi.orig -e 's|DefaultDestPath = "office52";|DefaultDestPath = "${PREFIX}/office52";|' ${WRKSRC}/setup.ins
-
do-install:
.if !defined(DISPLAY) || ${DISPLAY} == ""
@ ${ECHO}
diff --git a/editors/openoffice.org-3-RC/distinfo b/editors/openoffice.org-3-RC/distinfo
index f1e7894f7587..bc002ffc38b1 100644
--- a/editors/openoffice.org-3-RC/distinfo
+++ b/editors/openoffice.org-3-RC/distinfo
@@ -1,2 +1 @@
-MD5 (staroffice52/soa-5_2-ga-bin-linux-en.bin) = 8f36a55d7cefd919febdefb502ae986d
-MD5 (staroffice52/so-5_2-ga-bin-linux-en.bin) = 1f03de10b6127772ba87567d334aeb4d
+MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
diff --git a/editors/openoffice.org-3-RC/files/patch-bootstrap.1 b/editors/openoffice.org-3-RC/files/patch-bootstrap.1
new file mode 100644
index 000000000000..fc625e321cca
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-bootstrap.1
@@ -0,0 +1,11 @@
+--- config_office/bootstrap.1.orig Mon Sep 18 09:13:24 2000
++++ config_office/bootstrap.1 Fri Oct 13 17:51:37 2000
+@@ -9,6 +9,8 @@
+ make linux
+ else if ($platform == "Darwin") then
+ make macosx
++else if ($platform == "FreeBSD") then
++ make linux
+ endif
+
+ if "$?" != "0" exit
diff --git a/editors/openoffice.org-3-RC/files/patch-configure b/editors/openoffice.org-3-RC/files/patch-configure
new file mode 100644
index 000000000000..744225fe9d31
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-configure
@@ -0,0 +1,11 @@
+--- config_office/configure.orig Thu Oct 12 02:34:03 2000
++++ config_office/configure Fri Oct 13 17:52:25 2000
+@@ -739,7 +739,7 @@
+ echo $ac_n "checking the operating system""... $ac_c" 1>&6
+ echo "configure:741: checking the operating system" >&5
+ _os=`uname`
+-if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin"; then
++if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin" -o "$_os" = "FreeBSD"; then
+ echo "$ac_t""checked ($_os)" 1>&6
+ else
+ { echo "configure: error: $_os operating system is not suitable to build OpenOffice!" 1>&2; exit 1; }
diff --git a/editors/openoffice.org-3-RC/files/patch-set_soenv.1 b/editors/openoffice.org-3-RC/files/patch-set_soenv.1
new file mode 100644
index 000000000000..d18d3038c06b
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-set_soenv.1
@@ -0,0 +1,218 @@
+--- config_office/set_soenv.1.orig Thu Oct 12 10:16:28 2000
++++ config_office/set_soenv.1 Sun Oct 15 23:12:53 2000
+@@ -11,7 +11,7 @@
+ # Description:
+ # set_soenv generates a file that contains all necessary
+ # environment variables for the build proces of OpenOffice
+-# on Linux, Solaris, Windows NT and Macosx.
++# on Linux, Solaris, FreeBSD, Windows NT and Macosx.
+ # This script prompts the installer to enter:
+ # 1. (if necessary) The directory where the jdk is located (JAVA_HOME).
+ # 2. (if necessary) The directory where the Microsoft C/C++ compiler is located (COMPATH).
+@@ -53,7 +53,7 @@
+ #--------------------------------------------------------
+ #
+ my ( $outfile, $bootfile, $newline, $comment, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,
+- $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $Winnt, $Macosx, $WScomp,
++ $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Freebsd, $Linux, $Winnt, $Macosx, $WScomp,
+ $GNUcomp, $platform, $machine_type, $empty, $no_jdk, $no_tcsh, $no_cl, $no_gcc, $no_gcc_home, $no_gcc_include,
+ $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $win_format_var);
+ #
+@@ -121,6 +121,7 @@
+ $L = " -L"; # library search path
+ $D = " -D"; # define search path
+ $Solaris = "SunOS"; # return of uname command on Solaris
++$Freebsd = "FreeBSD"; # return of uname command on FreeBSD
+ $Linux = "Linux"; # return of uname command on Linux
+ $Winnt = "WINNT"; # return of uname command on Windows NT
+ $Macosx = "Darwin"; # return of uname command on Macosx
+@@ -162,8 +163,8 @@
+ #
+ $platform = `uname`; # probing the platform
+ chomp( $platform );
+-if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) )
+-{ die "This script is only suitable for the Solaris, Linux, Windows NT or Macosx platform!\n";
++if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) ) && ( $platform ne $Freebsd )
++{ die "This script is only suitable for the Solaris, FreeBSD, Linux, Windows NT or Macosx platform!\n";
+ }
+ else
+ { if ( $platform eq $Solaris )
+@@ -254,6 +255,54 @@
+ $PROSWITCH = "-DPRODUCT";
+ $XPVERSION = "3";
+ }
++elsif ( $platform eq "$Freebsd" )
++{ if ($machine_type eq "i686")
++ { print "Setting FreeBSD Intel specific values... ";
++ $outfile = "LinuxIntelEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "I";
++ $CPUNAME = "INTEL";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngi3";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ else
++ { if ($machine_type eq "alpha")
++ { print "Setting FreeBSD/Alpha specific values... ";
++ $outfile = "FreeBSDAlphaEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "S";
++ $CPUNAME = "ALPHA";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngs";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ }
++}
+ elsif ( $platform eq "$Linux" )
+ { if ($machine_type eq "i686")
+ { print "Setting Linux Intel specific values... ";
+@@ -430,7 +479,7 @@
+ }
+ # 4. Gcc path.
+ # Check whether autoconf found the compiler path.
+-if ($platform eq $Linux)
++if ($platform eq $Linux) -o ($platform eq $Freebsd)
+ { if ( $ARGV[ 0 ] eq $no_gcc)
+ { AddWarning( "set_soenv", "Autoconf did not find correct gcc compiler, prompted for value" );
+ printf "Did you build gcc 2.95.2 from source using the --prefix and --enable-shared flags (y/n)?: ";
+@@ -643,6 +692,13 @@
+ $ps.$par_dir.$LIB.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $LD_LIBRARY_PATH = $cur_dir.
++ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
++ $ps.$USR_LOCAL.$LIB.
++ $ps.$par_dir.$LIB.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $LD_LIBRARY_PATH = $cur_dir.
+ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
+@@ -681,6 +737,21 @@
+ $D."PRODUCT".
+ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARDEF = '"'.$D."UNX".
++ $D.$COM.
++ $D.$CVER.
++ $D.$GVER.
++ $D."_PTHREADS".
++ $D.$OS.
++ $D.$CPUNAME.
++ $D."X86".
++ $D."_REENTRANT".
++ $D."_POSIX_PTHREAD_SEMANTICS".
++ $D."SUPD=$UPD".
++ $D."PRODUCT".
++ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARDEF = '"'.$D."UNX".
+ $D.$COM.
+@@ -707,6 +778,12 @@
+ $L.$USR_DT.$LIB.
+ $L.$USR_OPENWIN.$LIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
++ $L.$LIB.
++ $L.$USR.$LIB.
++ $L.$USR.$LOCAL.$LIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
+ $L.$LIB.
+@@ -721,6 +798,9 @@
+ if ($platform eq "$Solaris")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
+@@ -790,6 +870,20 @@
+ $ps.$USR_DT.$BIN.
+ $ps.$USR.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $PATH = $cur_dir.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
++ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
++ $ps.'$SOLARENV'.$BIN.
++ $ps.'$JAVA_HOME'.$BIN;
++
++ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
++
++ $PATH .= $ps.$USR.$ds."sbin".
++ $ps.$ETC.
++ $ps.$USR.$BIN.$ds."X11".
++ $ps.$USR.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $PATH = $cur_dir.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
+@@ -861,6 +955,17 @@
+ $L.'$JAVA_HOME'.$LIB.
+ $L.$XLIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARLIB = '"'.$L.$par_dir.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.$LIB.
++ $L.$USR_LIB.
++ $L.$USR_LOCAL.$LIB.
++ $L.'$JAVA_HOME'.$LIB.
++ $L.$XLIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARLIB = '"'.$L.$par_dir.$LIB.
+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+@@ -898,6 +1003,16 @@
+ $I.'$JAVA_HOME'.$INCLUDE.
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."solaris".
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".'"';
++}
++elsif ($platform eq "$Freebsd")
++{ $SOLARINC .= $I.$GXX_INCLUDE.
++ $I.'$SOLARENV'.$INC.$ds."Xp31".
++ $I.'$JAVA_HOME'.$INCLUDE.
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."linux".
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".
++ $I.$XINC.
++ $I.$GCC_INCLUDE.
++ $I.$USR.$INCLUDE.'"';
+ }
+ elsif ($platform eq "$Linux")
+ { $SOLARINC .= $I.$GXX_INCLUDE.
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index d510844e3a06..664b4dc13769 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -1,3 +1,4 @@
+# ex:ts=8
# New ports collection makefile for: StarOffice 5.2
# Date created: 22 August 2000
# Whom: Martin Blapp
@@ -5,91 +6,18 @@
# $FreeBSD$
#
-PORTNAME= staroffice
-PORTVERSION= 5.2
-CATEGORIES= editors linux
-MASTER_SITES= ftp://ftp.inf.utfsm.cl/pub/UTFSM/StarOffice_5.2/ \
- ftp://ftp.snerpa.is/pub/linux/ \
- ftp://ftp.osb.hu/pub/mirrors/staroffice/linux/ \
- ftp://ftp.uni-linz.ac.at/pub/staroffice_5.2/ \
- ftp://ftp.labyrinth.net.au/.5/kk/linux/star_office/ \
- ftp://ftp.acs.oakland.edu/files/Linux/StarOffice/office52/ \
- ftp://ftp.ctio.noao.edu/linux/ \
- ftp://sunsite.cnlab-switch.ch/mirror/staroffice/english/ \
- ftp://ftp.linux.tucows.com/pub/Linuxberg/ \
- ftp://ftp.jcu.edu.au/pub/StarOffice/ \
- ftp://ftp.uakom.sk/pub/mirrors/StarOffice/ \
- ftp://ftp.linux.hr/pub/staroffice/5.2/
-DISTNAME= so-5_2-ga-bin-linux-en.bin
-DISTFILES= soa-5_2-ga-bin-linux-en.bin so-5_2-ga-bin-linux-en.bin
-EXTRACT_ONLY=
+PORTNAME= openoffice
+PORTVERSION= 6.0.a605
+CATEGORIES= editors
+MASTER_SITES= http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
+DISTNAME= oo_605_src
-MAINTAINER= mb@imp.ch
+MAINTAINER= obrien@FreeBSD.org
-FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-
-ONLY_FOR_ARCHS= i386
-NO_CDROM= 'Must be downloaded direct from Sun via www interface'
-IS_INTERACTIVE= yes
-NO_BUILD= yes
-DIST_SUBDIR= staroffice52
-WRKSRC= ${WRKDIR}/office52
-TMPDIR= ${WRKDIR}/tmp
-LD_PATH= ${TMPDIR}:${WRKSRC}:${LINUXBASE}/lib:${LINUXBASE}/usr/lib
+CONFIGURE_WRKSRC= ${WRKSRC}/config_office
.include <bsd.port.pre.mk>
-pre-fetch:
-.if ${OSVERSION} < 410000
- @${ECHO}
- @${ECHO} OS-VERSION ${OSVERSION}
- @${ECHO}
- @${ECHO} Staroffice depends on a scripting fix for
- @${ECHO} /usr/src/sys/i386/linux/linux_sysvec.c
- @${ECHO} \(revision 1.55.2.1 or higher\)
- @${ECHO}
- @${ECHO} Please upgrade to FreeBSD 4.1
- @${ECHO}
- @${FALSE}
-.endif
-.if defined(WITH_CDROM)
-.if !exists(${CD_MOUNTPT}/linux/office52/setup)
- @${ECHO}
- @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
- @${ECHO} onto /cdrom and run make again.
- @${ECHO}
- @${FALSE}
-.endif
-.endif
-
-.if defined(WITH_CDROM)
-do-extract:
- @${MKDIR} ${WRKSRC}/office52
- @cd ${WRKSRC}/office52 && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
-.endif
-
-do-extract:
-.if !defined(DISPLAY) || ${DISPLAY} == ""
- @ ${ECHO}
- @ ${ECHO} Can\'t open display:
- @ ${ECHO} Please check your DISPLAY variable.
- @ ${ECHO}
- @ ${FALSE}
-.else
- @${MKDIR} ${WRKSRC}
- @${MKDIR} ${TMPDIR}
- @${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC}
- @${CP} ${_DISTDIR}/soa-5_2-ga-bin-linux-en.bin ${WRKSRC}
- @${CHMOD} 755 ${WRKSRC}/${DISTNAME}
- @${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
- @cd ${WRKSRC}
- @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
- @cd ../../
-.endif
-
-post-configure:
- @${PERL} -pi.orig -e 's|DefaultDestPath = "office52";|DefaultDestPath = "${PREFIX}/office52";|' ${WRKSRC}/setup.ins
-
do-install:
.if !defined(DISPLAY) || ${DISPLAY} == ""
@ ${ECHO}
diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo
index f1e7894f7587..bc002ffc38b1 100644
--- a/editors/openoffice.org-3-devel/distinfo
+++ b/editors/openoffice.org-3-devel/distinfo
@@ -1,2 +1 @@
-MD5 (staroffice52/soa-5_2-ga-bin-linux-en.bin) = 8f36a55d7cefd919febdefb502ae986d
-MD5 (staroffice52/so-5_2-ga-bin-linux-en.bin) = 1f03de10b6127772ba87567d334aeb4d
+MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
diff --git a/editors/openoffice.org-3-devel/files/patch-bootstrap.1 b/editors/openoffice.org-3-devel/files/patch-bootstrap.1
new file mode 100644
index 000000000000..fc625e321cca
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-bootstrap.1
@@ -0,0 +1,11 @@
+--- config_office/bootstrap.1.orig Mon Sep 18 09:13:24 2000
++++ config_office/bootstrap.1 Fri Oct 13 17:51:37 2000
+@@ -9,6 +9,8 @@
+ make linux
+ else if ($platform == "Darwin") then
+ make macosx
++else if ($platform == "FreeBSD") then
++ make linux
+ endif
+
+ if "$?" != "0" exit
diff --git a/editors/openoffice.org-3-devel/files/patch-configure b/editors/openoffice.org-3-devel/files/patch-configure
new file mode 100644
index 000000000000..744225fe9d31
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-configure
@@ -0,0 +1,11 @@
+--- config_office/configure.orig Thu Oct 12 02:34:03 2000
++++ config_office/configure Fri Oct 13 17:52:25 2000
+@@ -739,7 +739,7 @@
+ echo $ac_n "checking the operating system""... $ac_c" 1>&6
+ echo "configure:741: checking the operating system" >&5
+ _os=`uname`
+-if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin"; then
++if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin" -o "$_os" = "FreeBSD"; then
+ echo "$ac_t""checked ($_os)" 1>&6
+ else
+ { echo "configure: error: $_os operating system is not suitable to build OpenOffice!" 1>&2; exit 1; }
diff --git a/editors/openoffice.org-3-devel/files/patch-set_soenv.1 b/editors/openoffice.org-3-devel/files/patch-set_soenv.1
new file mode 100644
index 000000000000..d18d3038c06b
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-set_soenv.1
@@ -0,0 +1,218 @@
+--- config_office/set_soenv.1.orig Thu Oct 12 10:16:28 2000
++++ config_office/set_soenv.1 Sun Oct 15 23:12:53 2000
+@@ -11,7 +11,7 @@
+ # Description:
+ # set_soenv generates a file that contains all necessary
+ # environment variables for the build proces of OpenOffice
+-# on Linux, Solaris, Windows NT and Macosx.
++# on Linux, Solaris, FreeBSD, Windows NT and Macosx.
+ # This script prompts the installer to enter:
+ # 1. (if necessary) The directory where the jdk is located (JAVA_HOME).
+ # 2. (if necessary) The directory where the Microsoft C/C++ compiler is located (COMPATH).
+@@ -53,7 +53,7 @@
+ #--------------------------------------------------------
+ #
+ my ( $outfile, $bootfile, $newline, $comment, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,
+- $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $Winnt, $Macosx, $WScomp,
++ $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Freebsd, $Linux, $Winnt, $Macosx, $WScomp,
+ $GNUcomp, $platform, $machine_type, $empty, $no_jdk, $no_tcsh, $no_cl, $no_gcc, $no_gcc_home, $no_gcc_include,
+ $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $win_format_var);
+ #
+@@ -121,6 +121,7 @@
+ $L = " -L"; # library search path
+ $D = " -D"; # define search path
+ $Solaris = "SunOS"; # return of uname command on Solaris
++$Freebsd = "FreeBSD"; # return of uname command on FreeBSD
+ $Linux = "Linux"; # return of uname command on Linux
+ $Winnt = "WINNT"; # return of uname command on Windows NT
+ $Macosx = "Darwin"; # return of uname command on Macosx
+@@ -162,8 +163,8 @@
+ #
+ $platform = `uname`; # probing the platform
+ chomp( $platform );
+-if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) )
+-{ die "This script is only suitable for the Solaris, Linux, Windows NT or Macosx platform!\n";
++if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) ) && ( $platform ne $Freebsd )
++{ die "This script is only suitable for the Solaris, FreeBSD, Linux, Windows NT or Macosx platform!\n";
+ }
+ else
+ { if ( $platform eq $Solaris )
+@@ -254,6 +255,54 @@
+ $PROSWITCH = "-DPRODUCT";
+ $XPVERSION = "3";
+ }
++elsif ( $platform eq "$Freebsd" )
++{ if ($machine_type eq "i686")
++ { print "Setting FreeBSD Intel specific values... ";
++ $outfile = "LinuxIntelEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "I";
++ $CPUNAME = "INTEL";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngi3";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ else
++ { if ($machine_type eq "alpha")
++ { print "Setting FreeBSD/Alpha specific values... ";
++ $outfile = "FreeBSDAlphaEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "S";
++ $CPUNAME = "ALPHA";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngs";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ }
++}
+ elsif ( $platform eq "$Linux" )
+ { if ($machine_type eq "i686")
+ { print "Setting Linux Intel specific values... ";
+@@ -430,7 +479,7 @@
+ }
+ # 4. Gcc path.
+ # Check whether autoconf found the compiler path.
+-if ($platform eq $Linux)
++if ($platform eq $Linux) -o ($platform eq $Freebsd)
+ { if ( $ARGV[ 0 ] eq $no_gcc)
+ { AddWarning( "set_soenv", "Autoconf did not find correct gcc compiler, prompted for value" );
+ printf "Did you build gcc 2.95.2 from source using the --prefix and --enable-shared flags (y/n)?: ";
+@@ -643,6 +692,13 @@
+ $ps.$par_dir.$LIB.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $LD_LIBRARY_PATH = $cur_dir.
++ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
++ $ps.$USR_LOCAL.$LIB.
++ $ps.$par_dir.$LIB.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $LD_LIBRARY_PATH = $cur_dir.
+ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
+@@ -681,6 +737,21 @@
+ $D."PRODUCT".
+ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARDEF = '"'.$D."UNX".
++ $D.$COM.
++ $D.$CVER.
++ $D.$GVER.
++ $D."_PTHREADS".
++ $D.$OS.
++ $D.$CPUNAME.
++ $D."X86".
++ $D."_REENTRANT".
++ $D."_POSIX_PTHREAD_SEMANTICS".
++ $D."SUPD=$UPD".
++ $D."PRODUCT".
++ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARDEF = '"'.$D."UNX".
+ $D.$COM.
+@@ -707,6 +778,12 @@
+ $L.$USR_DT.$LIB.
+ $L.$USR_OPENWIN.$LIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
++ $L.$LIB.
++ $L.$USR.$LIB.
++ $L.$USR.$LOCAL.$LIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
+ $L.$LIB.
+@@ -721,6 +798,9 @@
+ if ($platform eq "$Solaris")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
+@@ -790,6 +870,20 @@
+ $ps.$USR_DT.$BIN.
+ $ps.$USR.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $PATH = $cur_dir.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
++ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
++ $ps.'$SOLARENV'.$BIN.
++ $ps.'$JAVA_HOME'.$BIN;
++
++ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
++
++ $PATH .= $ps.$USR.$ds."sbin".
++ $ps.$ETC.
++ $ps.$USR.$BIN.$ds."X11".
++ $ps.$USR.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $PATH = $cur_dir.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
+@@ -861,6 +955,17 @@
+ $L.'$JAVA_HOME'.$LIB.
+ $L.$XLIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARLIB = '"'.$L.$par_dir.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.$LIB.
++ $L.$USR_LIB.
++ $L.$USR_LOCAL.$LIB.
++ $L.'$JAVA_HOME'.$LIB.
++ $L.$XLIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARLIB = '"'.$L.$par_dir.$LIB.
+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+@@ -898,6 +1003,16 @@
+ $I.'$JAVA_HOME'.$INCLUDE.
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."solaris".
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".'"';
++}
++elsif ($platform eq "$Freebsd")
++{ $SOLARINC .= $I.$GXX_INCLUDE.
++ $I.'$SOLARENV'.$INC.$ds."Xp31".
++ $I.'$JAVA_HOME'.$INCLUDE.
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."linux".
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".
++ $I.$XINC.
++ $I.$GCC_INCLUDE.
++ $I.$USR.$INCLUDE.'"';
+ }
+ elsif ($platform eq "$Linux")
+ { $SOLARINC .= $I.$GXX_INCLUDE.
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index d510844e3a06..664b4dc13769 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -1,3 +1,4 @@
+# ex:ts=8
# New ports collection makefile for: StarOffice 5.2
# Date created: 22 August 2000
# Whom: Martin Blapp
@@ -5,91 +6,18 @@
# $FreeBSD$
#
-PORTNAME= staroffice
-PORTVERSION= 5.2
-CATEGORIES= editors linux
-MASTER_SITES= ftp://ftp.inf.utfsm.cl/pub/UTFSM/StarOffice_5.2/ \
- ftp://ftp.snerpa.is/pub/linux/ \
- ftp://ftp.osb.hu/pub/mirrors/staroffice/linux/ \
- ftp://ftp.uni-linz.ac.at/pub/staroffice_5.2/ \
- ftp://ftp.labyrinth.net.au/.5/kk/linux/star_office/ \
- ftp://ftp.acs.oakland.edu/files/Linux/StarOffice/office52/ \
- ftp://ftp.ctio.noao.edu/linux/ \
- ftp://sunsite.cnlab-switch.ch/mirror/staroffice/english/ \
- ftp://ftp.linux.tucows.com/pub/Linuxberg/ \
- ftp://ftp.jcu.edu.au/pub/StarOffice/ \
- ftp://ftp.uakom.sk/pub/mirrors/StarOffice/ \
- ftp://ftp.linux.hr/pub/staroffice/5.2/
-DISTNAME= so-5_2-ga-bin-linux-en.bin
-DISTFILES= soa-5_2-ga-bin-linux-en.bin so-5_2-ga-bin-linux-en.bin
-EXTRACT_ONLY=
+PORTNAME= openoffice
+PORTVERSION= 6.0.a605
+CATEGORIES= editors
+MASTER_SITES= http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
+DISTNAME= oo_605_src
-MAINTAINER= mb@imp.ch
+MAINTAINER= obrien@FreeBSD.org
-FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-
-ONLY_FOR_ARCHS= i386
-NO_CDROM= 'Must be downloaded direct from Sun via www interface'
-IS_INTERACTIVE= yes
-NO_BUILD= yes
-DIST_SUBDIR= staroffice52
-WRKSRC= ${WRKDIR}/office52
-TMPDIR= ${WRKDIR}/tmp
-LD_PATH= ${TMPDIR}:${WRKSRC}:${LINUXBASE}/lib:${LINUXBASE}/usr/lib
+CONFIGURE_WRKSRC= ${WRKSRC}/config_office
.include <bsd.port.pre.mk>
-pre-fetch:
-.if ${OSVERSION} < 410000
- @${ECHO}
- @${ECHO} OS-VERSION ${OSVERSION}
- @${ECHO}
- @${ECHO} Staroffice depends on a scripting fix for
- @${ECHO} /usr/src/sys/i386/linux/linux_sysvec.c
- @${ECHO} \(revision 1.55.2.1 or higher\)
- @${ECHO}
- @${ECHO} Please upgrade to FreeBSD 4.1
- @${ECHO}
- @${FALSE}
-.endif
-.if defined(WITH_CDROM)
-.if !exists(${CD_MOUNTPT}/linux/office52/setup)
- @${ECHO}
- @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
- @${ECHO} onto /cdrom and run make again.
- @${ECHO}
- @${FALSE}
-.endif
-.endif
-
-.if defined(WITH_CDROM)
-do-extract:
- @${MKDIR} ${WRKSRC}/office52
- @cd ${WRKSRC}/office52 && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
-.endif
-
-do-extract:
-.if !defined(DISPLAY) || ${DISPLAY} == ""
- @ ${ECHO}
- @ ${ECHO} Can\'t open display:
- @ ${ECHO} Please check your DISPLAY variable.
- @ ${ECHO}
- @ ${FALSE}
-.else
- @${MKDIR} ${WRKSRC}
- @${MKDIR} ${TMPDIR}
- @${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC}
- @${CP} ${_DISTDIR}/soa-5_2-ga-bin-linux-en.bin ${WRKSRC}
- @${CHMOD} 755 ${WRKSRC}/${DISTNAME}
- @${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
- @cd ${WRKSRC}
- @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
- @cd ../../
-.endif
-
-post-configure:
- @${PERL} -pi.orig -e 's|DefaultDestPath = "office52";|DefaultDestPath = "${PREFIX}/office52";|' ${WRKSRC}/setup.ins
-
do-install:
.if !defined(DISPLAY) || ${DISPLAY} == ""
@ ${ECHO}
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
index f1e7894f7587..bc002ffc38b1 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -1,2 +1 @@
-MD5 (staroffice52/soa-5_2-ga-bin-linux-en.bin) = 8f36a55d7cefd919febdefb502ae986d
-MD5 (staroffice52/so-5_2-ga-bin-linux-en.bin) = 1f03de10b6127772ba87567d334aeb4d
+MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
diff --git a/editors/openoffice.org-3/files/patch-bootstrap.1 b/editors/openoffice.org-3/files/patch-bootstrap.1
new file mode 100644
index 000000000000..fc625e321cca
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-bootstrap.1
@@ -0,0 +1,11 @@
+--- config_office/bootstrap.1.orig Mon Sep 18 09:13:24 2000
++++ config_office/bootstrap.1 Fri Oct 13 17:51:37 2000
+@@ -9,6 +9,8 @@
+ make linux
+ else if ($platform == "Darwin") then
+ make macosx
++else if ($platform == "FreeBSD") then
++ make linux
+ endif
+
+ if "$?" != "0" exit
diff --git a/editors/openoffice.org-3/files/patch-configure b/editors/openoffice.org-3/files/patch-configure
new file mode 100644
index 000000000000..744225fe9d31
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-configure
@@ -0,0 +1,11 @@
+--- config_office/configure.orig Thu Oct 12 02:34:03 2000
++++ config_office/configure Fri Oct 13 17:52:25 2000
+@@ -739,7 +739,7 @@
+ echo $ac_n "checking the operating system""... $ac_c" 1>&6
+ echo "configure:741: checking the operating system" >&5
+ _os=`uname`
+-if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin"; then
++if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin" -o "$_os" = "FreeBSD"; then
+ echo "$ac_t""checked ($_os)" 1>&6
+ else
+ { echo "configure: error: $_os operating system is not suitable to build OpenOffice!" 1>&2; exit 1; }
diff --git a/editors/openoffice.org-3/files/patch-set_soenv.1 b/editors/openoffice.org-3/files/patch-set_soenv.1
new file mode 100644
index 000000000000..d18d3038c06b
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-set_soenv.1
@@ -0,0 +1,218 @@
+--- config_office/set_soenv.1.orig Thu Oct 12 10:16:28 2000
++++ config_office/set_soenv.1 Sun Oct 15 23:12:53 2000
+@@ -11,7 +11,7 @@
+ # Description:
+ # set_soenv generates a file that contains all necessary
+ # environment variables for the build proces of OpenOffice
+-# on Linux, Solaris, Windows NT and Macosx.
++# on Linux, Solaris, FreeBSD, Windows NT and Macosx.
+ # This script prompts the installer to enter:
+ # 1. (if necessary) The directory where the jdk is located (JAVA_HOME).
+ # 2. (if necessary) The directory where the Microsoft C/C++ compiler is located (COMPATH).
+@@ -53,7 +53,7 @@
+ #--------------------------------------------------------
+ #
+ my ( $outfile, $bootfile, $newline, $comment, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,
+- $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $Winnt, $Macosx, $WScomp,
++ $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Freebsd, $Linux, $Winnt, $Macosx, $WScomp,
+ $GNUcomp, $platform, $machine_type, $empty, $no_jdk, $no_tcsh, $no_cl, $no_gcc, $no_gcc_home, $no_gcc_include,
+ $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $win_format_var);
+ #
+@@ -121,6 +121,7 @@
+ $L = " -L"; # library search path
+ $D = " -D"; # define search path
+ $Solaris = "SunOS"; # return of uname command on Solaris
++$Freebsd = "FreeBSD"; # return of uname command on FreeBSD
+ $Linux = "Linux"; # return of uname command on Linux
+ $Winnt = "WINNT"; # return of uname command on Windows NT
+ $Macosx = "Darwin"; # return of uname command on Macosx
+@@ -162,8 +163,8 @@
+ #
+ $platform = `uname`; # probing the platform
+ chomp( $platform );
+-if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) )
+-{ die "This script is only suitable for the Solaris, Linux, Windows NT or Macosx platform!\n";
++if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) ) && ( $platform ne $Freebsd )
++{ die "This script is only suitable for the Solaris, FreeBSD, Linux, Windows NT or Macosx platform!\n";
+ }
+ else
+ { if ( $platform eq $Solaris )
+@@ -254,6 +255,54 @@
+ $PROSWITCH = "-DPRODUCT";
+ $XPVERSION = "3";
+ }
++elsif ( $platform eq "$Freebsd" )
++{ if ($machine_type eq "i686")
++ { print "Setting FreeBSD Intel specific values... ";
++ $outfile = "LinuxIntelEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "I";
++ $CPUNAME = "INTEL";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngi3";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ else
++ { if ($machine_type eq "alpha")
++ { print "Setting FreeBSD/Alpha specific values... ";
++ $outfile = "FreeBSDAlphaEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "S";
++ $CPUNAME = "ALPHA";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngs";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ }
++}
+ elsif ( $platform eq "$Linux" )
+ { if ($machine_type eq "i686")
+ { print "Setting Linux Intel specific values... ";
+@@ -430,7 +479,7 @@
+ }
+ # 4. Gcc path.
+ # Check whether autoconf found the compiler path.
+-if ($platform eq $Linux)
++if ($platform eq $Linux) -o ($platform eq $Freebsd)
+ { if ( $ARGV[ 0 ] eq $no_gcc)
+ { AddWarning( "set_soenv", "Autoconf did not find correct gcc compiler, prompted for value" );
+ printf "Did you build gcc 2.95.2 from source using the --prefix and --enable-shared flags (y/n)?: ";
+@@ -643,6 +692,13 @@
+ $ps.$par_dir.$LIB.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $LD_LIBRARY_PATH = $cur_dir.
++ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
++ $ps.$USR_LOCAL.$LIB.
++ $ps.$par_dir.$LIB.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $LD_LIBRARY_PATH = $cur_dir.
+ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
+@@ -681,6 +737,21 @@
+ $D."PRODUCT".
+ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARDEF = '"'.$D."UNX".
++ $D.$COM.
++ $D.$CVER.
++ $D.$GVER.
++ $D."_PTHREADS".
++ $D.$OS.
++ $D.$CPUNAME.
++ $D."X86".
++ $D."_REENTRANT".
++ $D."_POSIX_PTHREAD_SEMANTICS".
++ $D."SUPD=$UPD".
++ $D."PRODUCT".
++ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARDEF = '"'.$D."UNX".
+ $D.$COM.
+@@ -707,6 +778,12 @@
+ $L.$USR_DT.$LIB.
+ $L.$USR_OPENWIN.$LIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
++ $L.$LIB.
++ $L.$USR.$LIB.
++ $L.$USR.$LOCAL.$LIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
+ $L.$LIB.
+@@ -721,6 +798,9 @@
+ if ($platform eq "$Solaris")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
+@@ -790,6 +870,20 @@
+ $ps.$USR_DT.$BIN.
+ $ps.$USR.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $PATH = $cur_dir.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
++ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
++ $ps.'$SOLARENV'.$BIN.
++ $ps.'$JAVA_HOME'.$BIN;
++
++ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
++
++ $PATH .= $ps.$USR.$ds."sbin".
++ $ps.$ETC.
++ $ps.$USR.$BIN.$ds."X11".
++ $ps.$USR.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $PATH = $cur_dir.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
+@@ -861,6 +955,17 @@
+ $L.'$JAVA_HOME'.$LIB.
+ $L.$XLIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARLIB = '"'.$L.$par_dir.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.$LIB.
++ $L.$USR_LIB.
++ $L.$USR_LOCAL.$LIB.
++ $L.'$JAVA_HOME'.$LIB.
++ $L.$XLIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARLIB = '"'.$L.$par_dir.$LIB.
+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+@@ -898,6 +1003,16 @@
+ $I.'$JAVA_HOME'.$INCLUDE.
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."solaris".
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".'"';
++}
++elsif ($platform eq "$Freebsd")
++{ $SOLARINC .= $I.$GXX_INCLUDE.
++ $I.'$SOLARENV'.$INC.$ds."Xp31".
++ $I.'$JAVA_HOME'.$INCLUDE.
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."linux".
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".
++ $I.$XINC.
++ $I.$GCC_INCLUDE.
++ $I.$USR.$INCLUDE.'"';
+ }
+ elsif ($platform eq "$Linux")
+ { $SOLARINC .= $I.$GXX_INCLUDE.
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index d510844e3a06..664b4dc13769 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -1,3 +1,4 @@
+# ex:ts=8
# New ports collection makefile for: StarOffice 5.2
# Date created: 22 August 2000
# Whom: Martin Blapp
@@ -5,91 +6,18 @@
# $FreeBSD$
#
-PORTNAME= staroffice
-PORTVERSION= 5.2
-CATEGORIES= editors linux
-MASTER_SITES= ftp://ftp.inf.utfsm.cl/pub/UTFSM/StarOffice_5.2/ \
- ftp://ftp.snerpa.is/pub/linux/ \
- ftp://ftp.osb.hu/pub/mirrors/staroffice/linux/ \
- ftp://ftp.uni-linz.ac.at/pub/staroffice_5.2/ \
- ftp://ftp.labyrinth.net.au/.5/kk/linux/star_office/ \
- ftp://ftp.acs.oakland.edu/files/Linux/StarOffice/office52/ \
- ftp://ftp.ctio.noao.edu/linux/ \
- ftp://sunsite.cnlab-switch.ch/mirror/staroffice/english/ \
- ftp://ftp.linux.tucows.com/pub/Linuxberg/ \
- ftp://ftp.jcu.edu.au/pub/StarOffice/ \
- ftp://ftp.uakom.sk/pub/mirrors/StarOffice/ \
- ftp://ftp.linux.hr/pub/staroffice/5.2/
-DISTNAME= so-5_2-ga-bin-linux-en.bin
-DISTFILES= soa-5_2-ga-bin-linux-en.bin so-5_2-ga-bin-linux-en.bin
-EXTRACT_ONLY=
+PORTNAME= openoffice
+PORTVERSION= 6.0.a605
+CATEGORIES= editors
+MASTER_SITES= http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
+DISTNAME= oo_605_src
-MAINTAINER= mb@imp.ch
+MAINTAINER= obrien@FreeBSD.org
-FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-
-ONLY_FOR_ARCHS= i386
-NO_CDROM= 'Must be downloaded direct from Sun via www interface'
-IS_INTERACTIVE= yes
-NO_BUILD= yes
-DIST_SUBDIR= staroffice52
-WRKSRC= ${WRKDIR}/office52
-TMPDIR= ${WRKDIR}/tmp
-LD_PATH= ${TMPDIR}:${WRKSRC}:${LINUXBASE}/lib:${LINUXBASE}/usr/lib
+CONFIGURE_WRKSRC= ${WRKSRC}/config_office
.include <bsd.port.pre.mk>
-pre-fetch:
-.if ${OSVERSION} < 410000
- @${ECHO}
- @${ECHO} OS-VERSION ${OSVERSION}
- @${ECHO}
- @${ECHO} Staroffice depends on a scripting fix for
- @${ECHO} /usr/src/sys/i386/linux/linux_sysvec.c
- @${ECHO} \(revision 1.55.2.1 or higher\)
- @${ECHO}
- @${ECHO} Please upgrade to FreeBSD 4.1
- @${ECHO}
- @${FALSE}
-.endif
-.if defined(WITH_CDROM)
-.if !exists(${CD_MOUNTPT}/linux/office52/setup)
- @${ECHO}
- @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
- @${ECHO} onto /cdrom and run make again.
- @${ECHO}
- @${FALSE}
-.endif
-.endif
-
-.if defined(WITH_CDROM)
-do-extract:
- @${MKDIR} ${WRKSRC}/office52
- @cd ${WRKSRC}/office52 && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
-.endif
-
-do-extract:
-.if !defined(DISPLAY) || ${DISPLAY} == ""
- @ ${ECHO}
- @ ${ECHO} Can\'t open display:
- @ ${ECHO} Please check your DISPLAY variable.
- @ ${ECHO}
- @ ${FALSE}
-.else
- @${MKDIR} ${WRKSRC}
- @${MKDIR} ${TMPDIR}
- @${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC}
- @${CP} ${_DISTDIR}/soa-5_2-ga-bin-linux-en.bin ${WRKSRC}
- @${CHMOD} 755 ${WRKSRC}/${DISTNAME}
- @${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
- @cd ${WRKSRC}
- @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
- @cd ../../
-.endif
-
-post-configure:
- @${PERL} -pi.orig -e 's|DefaultDestPath = "office52";|DefaultDestPath = "${PREFIX}/office52";|' ${WRKSRC}/setup.ins
-
do-install:
.if !defined(DISPLAY) || ${DISPLAY} == ""
@ ${ECHO}
diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo
index f1e7894f7587..bc002ffc38b1 100644
--- a/editors/openoffice.org-vcltesttool/distinfo
+++ b/editors/openoffice.org-vcltesttool/distinfo
@@ -1,2 +1 @@
-MD5 (staroffice52/soa-5_2-ga-bin-linux-en.bin) = 8f36a55d7cefd919febdefb502ae986d
-MD5 (staroffice52/so-5_2-ga-bin-linux-en.bin) = 1f03de10b6127772ba87567d334aeb4d
+MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
diff --git a/editors/openoffice.org-vcltesttool/files/patch-bootstrap.1 b/editors/openoffice.org-vcltesttool/files/patch-bootstrap.1
new file mode 100644
index 000000000000..fc625e321cca
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-bootstrap.1
@@ -0,0 +1,11 @@
+--- config_office/bootstrap.1.orig Mon Sep 18 09:13:24 2000
++++ config_office/bootstrap.1 Fri Oct 13 17:51:37 2000
+@@ -9,6 +9,8 @@
+ make linux
+ else if ($platform == "Darwin") then
+ make macosx
++else if ($platform == "FreeBSD") then
++ make linux
+ endif
+
+ if "$?" != "0" exit
diff --git a/editors/openoffice.org-vcltesttool/files/patch-configure b/editors/openoffice.org-vcltesttool/files/patch-configure
new file mode 100644
index 000000000000..744225fe9d31
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-configure
@@ -0,0 +1,11 @@
+--- config_office/configure.orig Thu Oct 12 02:34:03 2000
++++ config_office/configure Fri Oct 13 17:52:25 2000
+@@ -739,7 +739,7 @@
+ echo $ac_n "checking the operating system""... $ac_c" 1>&6
+ echo "configure:741: checking the operating system" >&5
+ _os=`uname`
+-if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin"; then
++if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin" -o "$_os" = "FreeBSD"; then
+ echo "$ac_t""checked ($_os)" 1>&6
+ else
+ { echo "configure: error: $_os operating system is not suitable to build OpenOffice!" 1>&2; exit 1; }
diff --git a/editors/openoffice.org-vcltesttool/files/patch-set_soenv.1 b/editors/openoffice.org-vcltesttool/files/patch-set_soenv.1
new file mode 100644
index 000000000000..d18d3038c06b
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-set_soenv.1
@@ -0,0 +1,218 @@
+--- config_office/set_soenv.1.orig Thu Oct 12 10:16:28 2000
++++ config_office/set_soenv.1 Sun Oct 15 23:12:53 2000
+@@ -11,7 +11,7 @@
+ # Description:
+ # set_soenv generates a file that contains all necessary
+ # environment variables for the build proces of OpenOffice
+-# on Linux, Solaris, Windows NT and Macosx.
++# on Linux, Solaris, FreeBSD, Windows NT and Macosx.
+ # This script prompts the installer to enter:
+ # 1. (if necessary) The directory where the jdk is located (JAVA_HOME).
+ # 2. (if necessary) The directory where the Microsoft C/C++ compiler is located (COMPATH).
+@@ -53,7 +53,7 @@
+ #--------------------------------------------------------
+ #
+ my ( $outfile, $bootfile, $newline, $comment, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,
+- $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $Winnt, $Macosx, $WScomp,
++ $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Freebsd, $Linux, $Winnt, $Macosx, $WScomp,
+ $GNUcomp, $platform, $machine_type, $empty, $no_jdk, $no_tcsh, $no_cl, $no_gcc, $no_gcc_home, $no_gcc_include,
+ $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $win_format_var);
+ #
+@@ -121,6 +121,7 @@
+ $L = " -L"; # library search path
+ $D = " -D"; # define search path
+ $Solaris = "SunOS"; # return of uname command on Solaris
++$Freebsd = "FreeBSD"; # return of uname command on FreeBSD
+ $Linux = "Linux"; # return of uname command on Linux
+ $Winnt = "WINNT"; # return of uname command on Windows NT
+ $Macosx = "Darwin"; # return of uname command on Macosx
+@@ -162,8 +163,8 @@
+ #
+ $platform = `uname`; # probing the platform
+ chomp( $platform );
+-if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) )
+-{ die "This script is only suitable for the Solaris, Linux, Windows NT or Macosx platform!\n";
++if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) ) && ( $platform ne $Freebsd )
++{ die "This script is only suitable for the Solaris, FreeBSD, Linux, Windows NT or Macosx platform!\n";
+ }
+ else
+ { if ( $platform eq $Solaris )
+@@ -254,6 +255,54 @@
+ $PROSWITCH = "-DPRODUCT";
+ $XPVERSION = "3";
+ }
++elsif ( $platform eq "$Freebsd" )
++{ if ($machine_type eq "i686")
++ { print "Setting FreeBSD Intel specific values... ";
++ $outfile = "LinuxIntelEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "I";
++ $CPUNAME = "INTEL";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngi3";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ else
++ { if ($machine_type eq "alpha")
++ { print "Setting FreeBSD/Alpha specific values... ";
++ $outfile = "FreeBSDAlphaEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "S";
++ $CPUNAME = "ALPHA";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngs";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ }
++}
+ elsif ( $platform eq "$Linux" )
+ { if ($machine_type eq "i686")
+ { print "Setting Linux Intel specific values... ";
+@@ -430,7 +479,7 @@
+ }
+ # 4. Gcc path.
+ # Check whether autoconf found the compiler path.
+-if ($platform eq $Linux)
++if ($platform eq $Linux) -o ($platform eq $Freebsd)
+ { if ( $ARGV[ 0 ] eq $no_gcc)
+ { AddWarning( "set_soenv", "Autoconf did not find correct gcc compiler, prompted for value" );
+ printf "Did you build gcc 2.95.2 from source using the --prefix and --enable-shared flags (y/n)?: ";
+@@ -643,6 +692,13 @@
+ $ps.$par_dir.$LIB.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $LD_LIBRARY_PATH = $cur_dir.
++ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
++ $ps.$USR_LOCAL.$LIB.
++ $ps.$par_dir.$LIB.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $LD_LIBRARY_PATH = $cur_dir.
+ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
+@@ -681,6 +737,21 @@
+ $D."PRODUCT".
+ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARDEF = '"'.$D."UNX".
++ $D.$COM.
++ $D.$CVER.
++ $D.$GVER.
++ $D."_PTHREADS".
++ $D.$OS.
++ $D.$CPUNAME.
++ $D."X86".
++ $D."_REENTRANT".
++ $D."_POSIX_PTHREAD_SEMANTICS".
++ $D."SUPD=$UPD".
++ $D."PRODUCT".
++ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARDEF = '"'.$D."UNX".
+ $D.$COM.
+@@ -707,6 +778,12 @@
+ $L.$USR_DT.$LIB.
+ $L.$USR_OPENWIN.$LIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
++ $L.$LIB.
++ $L.$USR.$LIB.
++ $L.$USR.$LOCAL.$LIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
+ $L.$LIB.
+@@ -721,6 +798,9 @@
+ if ($platform eq "$Solaris")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
+@@ -790,6 +870,20 @@
+ $ps.$USR_DT.$BIN.
+ $ps.$USR.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $PATH = $cur_dir.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
++ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
++ $ps.'$SOLARENV'.$BIN.
++ $ps.'$JAVA_HOME'.$BIN;
++
++ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
++
++ $PATH .= $ps.$USR.$ds."sbin".
++ $ps.$ETC.
++ $ps.$USR.$BIN.$ds."X11".
++ $ps.$USR.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $PATH = $cur_dir.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
+@@ -861,6 +955,17 @@
+ $L.'$JAVA_HOME'.$LIB.
+ $L.$XLIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARLIB = '"'.$L.$par_dir.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.$LIB.
++ $L.$USR_LIB.
++ $L.$USR_LOCAL.$LIB.
++ $L.'$JAVA_HOME'.$LIB.
++ $L.$XLIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARLIB = '"'.$L.$par_dir.$LIB.
+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+@@ -898,6 +1003,16 @@
+ $I.'$JAVA_HOME'.$INCLUDE.
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."solaris".
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".'"';
++}
++elsif ($platform eq "$Freebsd")
++{ $SOLARINC .= $I.$GXX_INCLUDE.
++ $I.'$SOLARENV'.$INC.$ds."Xp31".
++ $I.'$JAVA_HOME'.$INCLUDE.
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."linux".
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".
++ $I.$XINC.
++ $I.$GCC_INCLUDE.
++ $I.$USR.$INCLUDE.'"';
+ }
+ elsif ($platform eq "$Linux")
+ { $SOLARINC .= $I.$GXX_INCLUDE.
diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile
index d510844e3a06..664b4dc13769 100644
--- a/editors/openoffice/Makefile
+++ b/editors/openoffice/Makefile
@@ -1,3 +1,4 @@
+# ex:ts=8
# New ports collection makefile for: StarOffice 5.2
# Date created: 22 August 2000
# Whom: Martin Blapp
@@ -5,91 +6,18 @@
# $FreeBSD$
#
-PORTNAME= staroffice
-PORTVERSION= 5.2
-CATEGORIES= editors linux
-MASTER_SITES= ftp://ftp.inf.utfsm.cl/pub/UTFSM/StarOffice_5.2/ \
- ftp://ftp.snerpa.is/pub/linux/ \
- ftp://ftp.osb.hu/pub/mirrors/staroffice/linux/ \
- ftp://ftp.uni-linz.ac.at/pub/staroffice_5.2/ \
- ftp://ftp.labyrinth.net.au/.5/kk/linux/star_office/ \
- ftp://ftp.acs.oakland.edu/files/Linux/StarOffice/office52/ \
- ftp://ftp.ctio.noao.edu/linux/ \
- ftp://sunsite.cnlab-switch.ch/mirror/staroffice/english/ \
- ftp://ftp.linux.tucows.com/pub/Linuxberg/ \
- ftp://ftp.jcu.edu.au/pub/StarOffice/ \
- ftp://ftp.uakom.sk/pub/mirrors/StarOffice/ \
- ftp://ftp.linux.hr/pub/staroffice/5.2/
-DISTNAME= so-5_2-ga-bin-linux-en.bin
-DISTFILES= soa-5_2-ga-bin-linux-en.bin so-5_2-ga-bin-linux-en.bin
-EXTRACT_ONLY=
+PORTNAME= openoffice
+PORTVERSION= 6.0.a605
+CATEGORIES= editors
+MASTER_SITES= http://a1376.g.akamai.net/7/1376/2064/OpenOffice605/anoncvs.openoffice.org/download/OpenOffice605/
+DISTNAME= oo_605_src
-MAINTAINER= mb@imp.ch
+MAINTAINER= obrien@FreeBSD.org
-FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
-
-ONLY_FOR_ARCHS= i386
-NO_CDROM= 'Must be downloaded direct from Sun via www interface'
-IS_INTERACTIVE= yes
-NO_BUILD= yes
-DIST_SUBDIR= staroffice52
-WRKSRC= ${WRKDIR}/office52
-TMPDIR= ${WRKDIR}/tmp
-LD_PATH= ${TMPDIR}:${WRKSRC}:${LINUXBASE}/lib:${LINUXBASE}/usr/lib
+CONFIGURE_WRKSRC= ${WRKSRC}/config_office
.include <bsd.port.pre.mk>
-pre-fetch:
-.if ${OSVERSION} < 410000
- @${ECHO}
- @${ECHO} OS-VERSION ${OSVERSION}
- @${ECHO}
- @${ECHO} Staroffice depends on a scripting fix for
- @${ECHO} /usr/src/sys/i386/linux/linux_sysvec.c
- @${ECHO} \(revision 1.55.2.1 or higher\)
- @${ECHO}
- @${ECHO} Please upgrade to FreeBSD 4.1
- @${ECHO}
- @${FALSE}
-.endif
-.if defined(WITH_CDROM)
-.if !exists(${CD_MOUNTPT}/linux/office52/setup)
- @${ECHO}
- @${ECHO} Please mount the Sun StarOffice 5.2 CDROM
- @${ECHO} onto /cdrom and run make again.
- @${ECHO}
- @${FALSE}
-.endif
-.endif
-
-.if defined(WITH_CDROM)
-do-extract:
- @${MKDIR} ${WRKSRC}/office52
- @cd ${WRKSRC}/office52 && ${LN} -s ${CD_MOUNTPT}/linux/office52/* .
-.endif
-
-do-extract:
-.if !defined(DISPLAY) || ${DISPLAY} == ""
- @ ${ECHO}
- @ ${ECHO} Can\'t open display:
- @ ${ECHO} Please check your DISPLAY variable.
- @ ${ECHO}
- @ ${FALSE}
-.else
- @${MKDIR} ${WRKSRC}
- @${MKDIR} ${TMPDIR}
- @${CP} ${_DISTDIR}/${DISTNAME} ${WRKSRC}
- @${CP} ${_DISTDIR}/soa-5_2-ga-bin-linux-en.bin ${WRKSRC}
- @${CHMOD} 755 ${WRKSRC}/${DISTNAME}
- @${CHMOD} 755 ${WRKSRC}/soa-5_2-ga-bin-linux-en.bin
- @cd ${WRKSRC}
- @SAL_IGNOREXERRORS=1 ${WRKSRC}/${DISTNAME} -extract ${WRKSRC}
- @cd ../../
-.endif
-
-post-configure:
- @${PERL} -pi.orig -e 's|DefaultDestPath = "office52";|DefaultDestPath = "${PREFIX}/office52";|' ${WRKSRC}/setup.ins
-
do-install:
.if !defined(DISPLAY) || ${DISPLAY} == ""
@ ${ECHO}
diff --git a/editors/openoffice/distinfo b/editors/openoffice/distinfo
index f1e7894f7587..bc002ffc38b1 100644
--- a/editors/openoffice/distinfo
+++ b/editors/openoffice/distinfo
@@ -1,2 +1 @@
-MD5 (staroffice52/soa-5_2-ga-bin-linux-en.bin) = 8f36a55d7cefd919febdefb502ae986d
-MD5 (staroffice52/so-5_2-ga-bin-linux-en.bin) = 1f03de10b6127772ba87567d334aeb4d
+MD5 (oo_605_src.tar.gz) = 9b7a175c8c72c26a5f2a850c6cdd7f87
diff --git a/editors/openoffice/files/patch-bootstrap.1 b/editors/openoffice/files/patch-bootstrap.1
new file mode 100644
index 000000000000..fc625e321cca
--- /dev/null
+++ b/editors/openoffice/files/patch-bootstrap.1
@@ -0,0 +1,11 @@
+--- config_office/bootstrap.1.orig Mon Sep 18 09:13:24 2000
++++ config_office/bootstrap.1 Fri Oct 13 17:51:37 2000
+@@ -9,6 +9,8 @@
+ make linux
+ else if ($platform == "Darwin") then
+ make macosx
++else if ($platform == "FreeBSD") then
++ make linux
+ endif
+
+ if "$?" != "0" exit
diff --git a/editors/openoffice/files/patch-config_office+set_soenv.1 b/editors/openoffice/files/patch-config_office+set_soenv.1
new file mode 100644
index 000000000000..d18d3038c06b
--- /dev/null
+++ b/editors/openoffice/files/patch-config_office+set_soenv.1
@@ -0,0 +1,218 @@
+--- config_office/set_soenv.1.orig Thu Oct 12 10:16:28 2000
++++ config_office/set_soenv.1 Sun Oct 15 23:12:53 2000
+@@ -11,7 +11,7 @@
+ # Description:
+ # set_soenv generates a file that contains all necessary
+ # environment variables for the build proces of OpenOffice
+-# on Linux, Solaris, Windows NT and Macosx.
++# on Linux, Solaris, FreeBSD, Windows NT and Macosx.
+ # This script prompts the installer to enter:
+ # 1. (if necessary) The directory where the jdk is located (JAVA_HOME).
+ # 2. (if necessary) The directory where the Microsoft C/C++ compiler is located (COMPATH).
+@@ -53,7 +53,7 @@
+ #--------------------------------------------------------
+ #
+ my ( $outfile, $bootfile, $newline, $comment, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,
+- $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $Winnt, $Macosx, $WScomp,
++ $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Freebsd, $Linux, $Winnt, $Macosx, $WScomp,
+ $GNUcomp, $platform, $machine_type, $empty, $no_jdk, $no_tcsh, $no_cl, $no_gcc, $no_gcc_home, $no_gcc_include,
+ $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $win_format_var);
+ #
+@@ -121,6 +121,7 @@
+ $L = " -L"; # library search path
+ $D = " -D"; # define search path
+ $Solaris = "SunOS"; # return of uname command on Solaris
++$Freebsd = "FreeBSD"; # return of uname command on FreeBSD
+ $Linux = "Linux"; # return of uname command on Linux
+ $Winnt = "WINNT"; # return of uname command on Windows NT
+ $Macosx = "Darwin"; # return of uname command on Macosx
+@@ -162,8 +163,8 @@
+ #
+ $platform = `uname`; # probing the platform
+ chomp( $platform );
+-if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) )
+-{ die "This script is only suitable for the Solaris, Linux, Windows NT or Macosx platform!\n";
++if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) ) && ( $platform ne $Freebsd )
++{ die "This script is only suitable for the Solaris, FreeBSD, Linux, Windows NT or Macosx platform!\n";
+ }
+ else
+ { if ( $platform eq $Solaris )
+@@ -254,6 +255,54 @@
+ $PROSWITCH = "-DPRODUCT";
+ $XPVERSION = "3";
+ }
++elsif ( $platform eq "$Freebsd" )
++{ if ($machine_type eq "i686")
++ { print "Setting FreeBSD Intel specific values... ";
++ $outfile = "LinuxIntelEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "I";
++ $CPUNAME = "INTEL";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngi3";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ else
++ { if ($machine_type eq "alpha")
++ { print "Setting FreeBSD/Alpha specific values... ";
++ $outfile = "FreeBSDAlphaEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "S";
++ $CPUNAME = "ALPHA";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngs";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ }
++}
+ elsif ( $platform eq "$Linux" )
+ { if ($machine_type eq "i686")
+ { print "Setting Linux Intel specific values... ";
+@@ -430,7 +479,7 @@
+ }
+ # 4. Gcc path.
+ # Check whether autoconf found the compiler path.
+-if ($platform eq $Linux)
++if ($platform eq $Linux) -o ($platform eq $Freebsd)
+ { if ( $ARGV[ 0 ] eq $no_gcc)
+ { AddWarning( "set_soenv", "Autoconf did not find correct gcc compiler, prompted for value" );
+ printf "Did you build gcc 2.95.2 from source using the --prefix and --enable-shared flags (y/n)?: ";
+@@ -643,6 +692,13 @@
+ $ps.$par_dir.$LIB.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $LD_LIBRARY_PATH = $cur_dir.
++ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
++ $ps.$USR_LOCAL.$LIB.
++ $ps.$par_dir.$LIB.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $LD_LIBRARY_PATH = $cur_dir.
+ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
+@@ -681,6 +737,21 @@
+ $D."PRODUCT".
+ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARDEF = '"'.$D."UNX".
++ $D.$COM.
++ $D.$CVER.
++ $D.$GVER.
++ $D."_PTHREADS".
++ $D.$OS.
++ $D.$CPUNAME.
++ $D."X86".
++ $D."_REENTRANT".
++ $D."_POSIX_PTHREAD_SEMANTICS".
++ $D."SUPD=$UPD".
++ $D."PRODUCT".
++ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARDEF = '"'.$D."UNX".
+ $D.$COM.
+@@ -707,6 +778,12 @@
+ $L.$USR_DT.$LIB.
+ $L.$USR_OPENWIN.$LIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
++ $L.$LIB.
++ $L.$USR.$LIB.
++ $L.$USR.$LOCAL.$LIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
+ $L.$LIB.
+@@ -721,6 +798,9 @@
+ if ($platform eq "$Solaris")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
+@@ -790,6 +870,20 @@
+ $ps.$USR_DT.$BIN.
+ $ps.$USR.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $PATH = $cur_dir.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
++ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
++ $ps.'$SOLARENV'.$BIN.
++ $ps.'$JAVA_HOME'.$BIN;
++
++ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
++
++ $PATH .= $ps.$USR.$ds."sbin".
++ $ps.$ETC.
++ $ps.$USR.$BIN.$ds."X11".
++ $ps.$USR.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $PATH = $cur_dir.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
+@@ -861,6 +955,17 @@
+ $L.'$JAVA_HOME'.$LIB.
+ $L.$XLIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARLIB = '"'.$L.$par_dir.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.$LIB.
++ $L.$USR_LIB.
++ $L.$USR_LOCAL.$LIB.
++ $L.'$JAVA_HOME'.$LIB.
++ $L.$XLIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARLIB = '"'.$L.$par_dir.$LIB.
+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+@@ -898,6 +1003,16 @@
+ $I.'$JAVA_HOME'.$INCLUDE.
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."solaris".
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".'"';
++}
++elsif ($platform eq "$Freebsd")
++{ $SOLARINC .= $I.$GXX_INCLUDE.
++ $I.'$SOLARENV'.$INC.$ds."Xp31".
++ $I.'$JAVA_HOME'.$INCLUDE.
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."linux".
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".
++ $I.$XINC.
++ $I.$GCC_INCLUDE.
++ $I.$USR.$INCLUDE.'"';
+ }
+ elsif ($platform eq "$Linux")
+ { $SOLARINC .= $I.$GXX_INCLUDE.
diff --git a/editors/openoffice/files/patch-configure b/editors/openoffice/files/patch-configure
new file mode 100644
index 000000000000..744225fe9d31
--- /dev/null
+++ b/editors/openoffice/files/patch-configure
@@ -0,0 +1,11 @@
+--- config_office/configure.orig Thu Oct 12 02:34:03 2000
++++ config_office/configure Fri Oct 13 17:52:25 2000
+@@ -739,7 +739,7 @@
+ echo $ac_n "checking the operating system""... $ac_c" 1>&6
+ echo "configure:741: checking the operating system" >&5
+ _os=`uname`
+-if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin"; then
++if test "$_os" = "SunOS" -o "$_os" = "Linux" -o "$_os" = "WINNT" -o "$_os" = "Darwin" -o "$_os" = "FreeBSD"; then
+ echo "$ac_t""checked ($_os)" 1>&6
+ else
+ { echo "configure: error: $_os operating system is not suitable to build OpenOffice!" 1>&2; exit 1; }
diff --git a/editors/openoffice/files/patch-set_soenv.1 b/editors/openoffice/files/patch-set_soenv.1
new file mode 100644
index 000000000000..d18d3038c06b
--- /dev/null
+++ b/editors/openoffice/files/patch-set_soenv.1
@@ -0,0 +1,218 @@
+--- config_office/set_soenv.1.orig Thu Oct 12 10:16:28 2000
++++ config_office/set_soenv.1 Sun Oct 15 23:12:53 2000
+@@ -11,7 +11,7 @@
+ # Description:
+ # set_soenv generates a file that contains all necessary
+ # environment variables for the build proces of OpenOffice
+-# on Linux, Solaris, Windows NT and Macosx.
++# on Linux, Solaris, FreeBSD, Windows NT and Macosx.
+ # This script prompts the installer to enter:
+ # 1. (if necessary) The directory where the jdk is located (JAVA_HOME).
+ # 2. (if necessary) The directory where the Microsoft C/C++ compiler is located (COMPATH).
+@@ -53,7 +53,7 @@
+ #--------------------------------------------------------
+ #
+ my ( $outfile, $bootfile, $newline, $comment, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,
+- $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $Winnt, $Macosx, $WScomp,
++ $par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Freebsd, $Linux, $Winnt, $Macosx, $WScomp,
+ $GNUcomp, $platform, $machine_type, $empty, $no_jdk, $no_tcsh, $no_cl, $no_gcc, $no_gcc_home, $no_gcc_include,
+ $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $win_format_var);
+ #
+@@ -121,6 +121,7 @@
+ $L = " -L"; # library search path
+ $D = " -D"; # define search path
+ $Solaris = "SunOS"; # return of uname command on Solaris
++$Freebsd = "FreeBSD"; # return of uname command on FreeBSD
+ $Linux = "Linux"; # return of uname command on Linux
+ $Winnt = "WINNT"; # return of uname command on Windows NT
+ $Macosx = "Darwin"; # return of uname command on Macosx
+@@ -162,8 +163,8 @@
+ #
+ $platform = `uname`; # probing the platform
+ chomp( $platform );
+-if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) )
+-{ die "This script is only suitable for the Solaris, Linux, Windows NT or Macosx platform!\n";
++if ( ( $platform ne $Solaris ) && ( $platform ne $Linux ) && ($platform ne $Winnt) && ($platform ne $Macosx) ) && ( $platform ne $Freebsd )
++{ die "This script is only suitable for the Solaris, FreeBSD, Linux, Windows NT or Macosx platform!\n";
+ }
+ else
+ { if ( $platform eq $Solaris )
+@@ -254,6 +255,54 @@
+ $PROSWITCH = "-DPRODUCT";
+ $XPVERSION = "3";
+ }
++elsif ( $platform eq "$Freebsd" )
++{ if ($machine_type eq "i686")
++ { print "Setting FreeBSD Intel specific values... ";
++ $outfile = "LinuxIntelEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "I";
++ $CPUNAME = "INTEL";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngi3";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ else
++ { if ($machine_type eq "alpha")
++ { print "Setting FreeBSD/Alpha specific values... ";
++ $outfile = "FreeBSDAlphaEnv.Set";
++ $BIG_SVX = "TRUE";
++ $COM = "GCC";
++ $COMPATH = $ARGV[ 0 ];
++ $CPU = "S";
++ $CPUNAME = "ALPHA";
++ $CVER = "C295";
++ $DLLSUFFIX = "li";
++ $GUI = "UNX";
++ $GUIBASE = "unx";
++ $GUIENV = "sal";
++ $GVER = "VCL";
++ $OUTPATH = "unxlngs";
++ $INPATH = $OUTPATH.$PROEXT;
++ $GVERDIR = $INPATH;
++ $OS = "FREEBSD";
++ $PATH_SEPERATOR = $ps;
++ $PROSWITCH = "-DPRODUCT";
++ $XPVERSION = "3";
++ }
++ }
++}
+ elsif ( $platform eq "$Linux" )
+ { if ($machine_type eq "i686")
+ { print "Setting Linux Intel specific values... ";
+@@ -430,7 +479,7 @@
+ }
+ # 4. Gcc path.
+ # Check whether autoconf found the compiler path.
+-if ($platform eq $Linux)
++if ($platform eq $Linux) -o ($platform eq $Freebsd)
+ { if ( $ARGV[ 0 ] eq $no_gcc)
+ { AddWarning( "set_soenv", "Autoconf did not find correct gcc compiler, prompted for value" );
+ printf "Did you build gcc 2.95.2 from source using the --prefix and --enable-shared flags (y/n)?: ";
+@@ -643,6 +692,13 @@
+ $ps.$par_dir.$LIB.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $LD_LIBRARY_PATH = $cur_dir.
++ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
++ $ps.$USR_LOCAL.$LIB.
++ $ps.$par_dir.$LIB.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $LD_LIBRARY_PATH = $cur_dir.
+ $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
+@@ -681,6 +737,21 @@
+ $D."PRODUCT".
+ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARDEF = '"'.$D."UNX".
++ $D.$COM.
++ $D.$CVER.
++ $D.$GVER.
++ $D."_PTHREADS".
++ $D.$OS.
++ $D.$CPUNAME.
++ $D."X86".
++ $D."_REENTRANT".
++ $D."_POSIX_PTHREAD_SEMANTICS".
++ $D."SUPD=$UPD".
++ $D."PRODUCT".
++ $D."UPDVER=".'""'."'".'"'."'".'"'."SV$UPD".'"'."'".'"'."'".'"'.'"'.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARDEF = '"'.$D."UNX".
+ $D.$COM.
+@@ -707,6 +778,12 @@
+ $L.$USR_DT.$LIB.
+ $L.$USR_OPENWIN.$LIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
++ $L.$LIB.
++ $L.$USR.$LIB.
++ $L.$USR.$LOCAL.$LIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
+ $L.$LIB.
+@@ -721,6 +798,9 @@
+ if ($platform eq "$Solaris")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARINCLUDES = '"'.$I.'$SOLARENV'.$INC.'"';
+ }
+@@ -790,6 +870,20 @@
+ $ps.$USR_DT.$BIN.
+ $ps.$USR.$LIB;
+ }
++elsif ($platform eq "$Freebsd")
++{ $PATH = $cur_dir.
++ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
++ $ps.'$SOLARENV'.$ds.'$OUTPATH'.$BIN.
++ $ps.'$SOLARENV'.$BIN.
++ $ps.'$JAVA_HOME'.$BIN;
++
++ $PATH .= GetCorrectPath($COMPATH, $PERL_PATH, $TCSH_PATH, $compiler);
++
++ $PATH .= $ps.$USR.$ds."sbin".
++ $ps.$ETC.
++ $ps.$USR.$BIN.$ds."X11".
++ $ps.$USR.$LIB;
++}
+ elsif ($platform eq "$Linux")
+ { $PATH = $cur_dir.
+ $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
+@@ -861,6 +955,17 @@
+ $L.'$JAVA_HOME'.$LIB.
+ $L.$XLIB.'"';
+ }
++elsif ($platform eq "$Freebsd")
++{ $SOLARLIB = '"'.$L.$par_dir.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
++ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
++ $L.$LIB.
++ $L.$USR_LIB.
++ $L.$USR_LOCAL.$LIB.
++ $L.'$JAVA_HOME'.$LIB.
++ $L.$XLIB.'"';
++}
+ elsif ($platform eq "$Linux")
+ { $SOLARLIB = '"'.$L.$par_dir.$LIB.
+ $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
+@@ -898,6 +1003,16 @@
+ $I.'$JAVA_HOME'.$INCLUDE.
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."solaris".
+ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".'"';
++}
++elsif ($platform eq "$Freebsd")
++{ $SOLARINC .= $I.$GXX_INCLUDE.
++ $I.'$SOLARENV'.$INC.$ds."Xp31".
++ $I.'$JAVA_HOME'.$INCLUDE.
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."linux".
++ $I.'$JAVA_HOME'.$INCLUDE.$ds."native_threads".$ds."include".
++ $I.$XINC.
++ $I.$GCC_INCLUDE.
++ $I.$USR.$INCLUDE.'"';
+ }
+ elsif ($platform eq "$Linux")
+ { $SOLARINC .= $I.$GXX_INCLUDE.