updating to 1.1.4
Peter Jeremy
PeterJeremy at optushome.com.au
Tue Jan 11 00:40:28 PST 2005
On Wed, 2005-Jan-05 17:44:51 -0500, Mikhail Teterin wrote:
>I've placed the new version of the port at
>
> http://virtual-estates.net/~mi/port-stuff/ooo.tar.bz
Thanks for your efforts.
Further comments/problems (sorry for the delay):
1) Makefile problems
a) libxpcom.so is under X11BASE, not LOCALBASE
b) devel/nspr installs nspr4 not nspr
c) LDFLAGS should be -L${LOCALBASE}/lib not -L${LOCALBASE}/include
d) LDFLAGS needs to include both X11BASE and LOCALBASE [*]
2) distinfo problems
a) OOo-GCC-3.4.patch.bz2 has the wrong size and checksum (as already advised)
3) configure.in problems
a) The passed LDFLAGS is lost during config processing [*]
A patch for all these is attached (though the "fixes" for 1d and 3a are
"hacks" rather than real fixes).
[*] Without these, the OO.org configure fails with:
checking mspack.h usability... yes
checking mspack.h presence... yes
checking for mspack.h... yes
checking for mspack_create_cab_decompressor in -lmspack... no
configure: error: libmspack not installed or functional
===> Script "configure" failed unexpectedly.
Please report the problem to openoffice at FreeBSD.org [maintainer] and attach
the "/home/obj/home/peter/ooo-114/work/config_office/config.log" including
the output of the failure of your make command. Also, it might be a good idea
to provide an overview of all packages installed on your system (e.g. an `ls
/var/db/pkg`).
*** Error code 1
At this point, I still can't get OO.org to compile on 5.3-RELEASE-p2. I
get a consistent failure:
...
gmake[1]: Entering directory `/home/obj/home/peter/ooo-114/work/icu/unxfbsd.pro/misc/build/icu/source/common'
...
cc -I. -I. -DHAVE_CONFIG_H -DU_COMMON_IMPLEMENTATION -O -c -o uresdata.ao uresdata.c
/usr/bin/ar rv libicuuc.a uresdata.ao
a - uresdata.ao
c++ -I. -I. -DHAVE_CONFIG_H -DU_COMMON_IMPLEMENTATION -O -c -o resbund.ao resbund.cpp
In file included from unicode/resbund.h:53,
from resbund.cpp:50:
./unicode/locid.h:731: error: using typedef-name `icu_2_2::Locale::LocaleProxy' after `struct'
gmake[1]: *** [resbund.ao] Error 1
rm udata.ao uresbund.ao mutex.ao locmap.ao putil.ao uobject.ao filestrm.ao uresdata.ao umutex.ao ucmndata.ao udatamem.ao umapfile.
ao
gmake[1]: Leaving directory `/home/obj/home/peter/ooo-114/work/icu/unxfbsd.pro/misc/build/icu/source/common'
gmake: *** [all-recursive] Error 2
dmake: Error code 2, while making './unxfbsd.pro/misc/build/so_built_so_icu'
---* TG_SLO.MK *---
ERROR: Error 65280 occurred while making /home/obj/home/peter/ooo-114/work/icu
dmake: Error code 1, while making 'build_all'
---* TG_SLO.MK *---
*** Error code 255
Stop in /home/peter/ooo-114.
I haven't tried looking into this.
--
Peter Jeremy
-------------- next part --------------
diff -ur ooo-114.orig/Makefile ooo-114/Makefile
--- ooo-114.orig/Makefile Sat Jan 1 16:35:07 2005
+++ ooo-114/Makefile Sat Jan 8 10:02:49 2005
@@ -99,7 +99,7 @@
gcp:${PORTSDIR}/sysutils/coreutils \
xmkmf:${X_IMAKE_PORT} \
${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport \
- ${LOCALBASE}/lib/mozilla/libxpcom.so:${PORTSDIR}/www/mozilla \
+ ${X11BASE}/lib/mozilla/libxpcom.so:${PORTSDIR}/www/mozilla \
${X11BASE}/lib/libXft.a:${PORTSDIR}/x11-fonts/libXft
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
@@ -107,10 +107,10 @@
mspack:${PORTSDIR}/archivers/libmspack \
audio:${PORTSDIR}/audio/nas \
curl:${PORTSDIR}/ftp/curl \
- nspr:${PORTSDIR}/devel/nspr \
+ nspr4:${PORTSDIR}/devel/nspr \
freetype.9:${PORTSDIR}/print/freetype2
RUN_DEPENDS+= ${LOCALBASE}/lib/libstlport_gcc.so:${PORTSDIR}/devel/stlport \
- ${LOCALBASE}/lib/mozilla/libxpcom.so:${PORTSDIR}/www/mozilla \
+ ${X11BASE}/lib/mozilla/libxpcom.so:${PORTSDIR}/www/mozilla \
${X11BASE}/lib/libXft.a:${PORTSDIR}/x11-fonts/libXft
# OOs insists on neon-23 and rejects neon-24
@@ -134,8 +134,8 @@
BUILD= dmake
CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/include" \
+ CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
PTHREAD_LIBS=${PTHREAD_LIBS}
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \
${EXTERNALS:C,^,--with-system-,} \
Only in ooo-114: Makefile~
diff -ur ooo-114.orig/distinfo ooo-114/distinfo
--- ooo-114.orig/distinfo Sat Jan 1 07:17:21 2005
+++ ooo-114/distinfo Sat Jan 8 06:48:05 2005
@@ -6,5 +6,5 @@
SIZE (openoffice1.1/patch-openoffice-mozilla101-2002-10-14) = 29105
MD5 (openoffice1.1/mozilla-vendor-1.0.2a.tgz) = b0f2397d001aba7d4dd39f57a21d8468
SIZE (openoffice1.1/mozilla-vendor-1.0.2a.tgz) = 7292
-MD5 (openoffice1.1/OOo-GCC-3.4.patch.bz2) = 7c143e3bc6e520336fde99159b72a5f9
-SIZE (openoffice1.1/OOo-GCC-3.4.patch.bz2) = 34115
+MD5 (openoffice1.1/OOo-GCC-3.4.patch.bz2) = b468a543d2e2ca54b484bb2875901c06
+SIZE (openoffice1.1/OOo-GCC-3.4.patch.bz2) = 32776
diff -ur ooo-114.orig/files/patch-config_office+configure.in ooo-114/files/patch-config_office+configure.in
--- ooo-114.orig/files/patch-config_office+configure.in Sat Dec 18 14:24:11 2004
+++ ooo-114/files/patch-config_office+configure.in Sat Jan 8 11:02:43 2005
@@ -3,8 +3,8 @@
RCS file: /cvs/tools/config_office/configure.in,v
retrieving revision 1.55.6.10
diff -u -r1.55.6.10 configure.in
---- config_office/configure.in 27 Aug 2004 10:03:41 -0000 1.55.6.10
-+++ config_office/configure.in 18 Dec 2004 03:13:51 -0000
+--- configure.in.orig Fri Aug 27 20:03:41 2004
++++ configure.in Sat Jan 8 10:03:43 2005
@@ -357,13 +357,14 @@
OSVERSION=`/sbin/sysctl -n kern.osreldate`
fi
@@ -22,3 +22,12 @@
fi
;;
"OSF1")
+@@ -1552,7 +1553,7 @@
+ AC_MSG_ERROR([No X includes found]) # Exit
+ fi
+ CFLAGS=$X_CFLAGS
+- LDFLAGS="$X_LDFLAGS $X_LIBS"
++ LDFLAGS="$LDFLAGS $X_LDFLAGS $X_LIBS"
+ AC_CHECK_LIB(X11, XOpenDisplay, x_libs="-lX11 $X_EXTRA_LIBS", [AC_MSG_ERROR([X Development libraries not found])])
+ else
+ x_includes="no_x_includes"
Only in ooo-114: typescript
Only in ooo-114: typescript.1
More information about the freebsd-openoffice
mailing list