diff options
23 files changed, 91 insertions, 183 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index 73c35c3f9da3..07313c68332f 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= openoffice.org -PORTVERSION?= 2.0.${SNAPDATE} +PORTVERSION?= 2.2.${SNAPDATE} CATEGORIES+= editors java MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \ http://openoffice.lunarshells.com/sources/ \ @@ -71,11 +71,11 @@ IGNORE= install lang/perl5.8 then try again .endif CODELINE= 680 -RELEASE_NR= 2.0 -MILESTONE?= 191 +RELEASE_NR= 2.2 +MILESTONE?= 193 OOOTAG?= SRC680_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} -SNAPDATE= 20061101 +SNAPDATE= 20061110 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org2.0 @@ -98,9 +98,9 @@ PKGNAMESUFFIX?= -${LANG_SUFFIX} .if defined(WITH_GNUGCJ) GCCVER=41 BUILD_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt -BUILD_DEPEND+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat +BUILD_DEPENDS+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat RUN_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt -RUN_DEPEND+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat +RUN_DEPENDS+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat .else .if ${ARCH} == amd64 GCCVER=41 @@ -257,7 +257,7 @@ post-install: -e '/^Exec/s/printeradmin/spadmin/' \ ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop @${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak - @{LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \ + @${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \ ${PREFIX}/share/applications/${EXECBASE} @${PRINTF} "share/applications/${EXECBASE}\n" >> ${TMPPLIST} @for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \ diff --git a/editors/openoffice-3-devel/distinfo b/editors/openoffice-3-devel/distinfo index f8bcb1e7c861..890ac27b53b4 100644 --- a/editors/openoffice-3-devel/distinfo +++ b/editors/openoffice-3-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = e67107b02f384165f05e34b92dad3a13 -SHA256 (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = d616def00600a9b2299dea9617f232c1bea1adb192c2820e0d44aa430c6c6753 -SIZE (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = 261869653 +MD5 (openoffice.org2.0/OOo_SRC680_m193_source.tar.bz2) = 7d4ef341d25c8b947eaa3461f93a76d3 +SHA256 (openoffice.org2.0/OOo_SRC680_m193_source.tar.bz2) = 6e9642861190052d94e23ed26775722ea85e013379a9f6a704abc70d4bbef947 +SIZE (openoffice.org2.0/OOo_SRC680_m193_source.tar.bz2) = 262577471 MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org2.0/unowinreg.dll) = 6144 diff --git a/editors/openoffice-3-devel/files/Makefile.knobs b/editors/openoffice-3-devel/files/Makefile.knobs index 85ab949146a4..9ce1258cdf1c 100644 --- a/editors/openoffice-3-devel/files/Makefile.knobs +++ b/editors/openoffice-3-devel/files/Makefile.knobs @@ -31,6 +31,12 @@ CONFIGURE_ARGS+= --disable-gnome-vfs USE_GNOME+= gnomevfs2 .endif +.if defined(WITH_EVOLUTION2) +CONFIGURE_ARGS+= --enable-evolution2=yes +.else +USE_GNOME+= glib20 +.endif + .if defined(ALL_LOCALIZED_LANGS) CONFIGURE_ARGS+= --with-lang=ALL .else @@ -121,6 +127,11 @@ pre-fetch: @${ECHO} "You can compile OOo with gpc instead of libart by" @${ECHO} "make -DWITH_GPC" .endif +.if !defined(WITH_EVOLUTION2) + @${ECHO} + @${ECHO} "You can compile OOo with evolution2 support by" + @${ECHO} "make -DWITH_EVOLUTION2" +.endif @${ECHO} @${ECHO} "NOTICE:" @${ECHO} diff --git a/editors/openoffice-3-devel/files/openoffice.org-wrapper b/editors/openoffice-3-devel/files/openoffice.org-wrapper index a5149e8e21d5..8c741007682a 100644 --- a/editors/openoffice-3-devel/files/openoffice.org-wrapper +++ b/editors/openoffice-3-devel/files/openoffice.org-wrapper @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3-devel/files/Attic/openoffice.org-wrapper,v 1.2 2005-12-23 03:06:18 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice-3-devel/files/Attic/openoffice.org-wrapper,v 1.3 2006-11-12 22:11:35 maho Exp $ oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/ program=`echo $0 | sed -e 's|.*-%%OOOTAG%%-||'` diff --git a/editors/openoffice-3-devel/files/patch-i71039 b/editors/openoffice-3-devel/files/patch-i71039 deleted file mode 100644 index 8f0897bc862b..000000000000 --- a/editors/openoffice-3-devel/files/patch-i71039 +++ /dev/null @@ -1,34 +0,0 @@ ---- binfilter/inc/bf_svx/svdobj.hxx.orig Mon Oct 23 13:47:55 2006 -+++ binfilter/inc/bf_svx/svdobj.hxx Mon Oct 23 13:48:08 2006 -@@ -265,7 +265,7 @@ - {} - virtual ~SdrObjUserData(); - -- virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL; -+ virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; - UINT32 GetInventor() const { return nInventor; } - UINT16 GetId() const { return nIdentifier; } - virtual void WriteData(SvStream& rOut); - ---- svx/inc/svdobj.hxx.orig Mon Oct 23 12:56:33 2006 -+++ svx/inc/svdobj.hxx Mon Oct 23 12:56:50 2006 -@@ -323,7 +323,7 @@ - {} - virtual ~SdrObjUserData(); - -- virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL; -+ virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; - UINT32 GetInventor() const { return nInventor; } - UINT16 GetId() const { return nIdentifier; } - //BFS01virtual void WriteData(SvStream& rOut); ---- sc/source/ui/inc/csvcontrol.hxx~ Fri Sep 9 06:17:47 2005 -+++ sc/source/ui/inc/csvcontrol.hxx Sat Nov 4 08:46:16 2006 -@@ -444,7 +444,7 @@ - - protected: - /** Derived classes create a new accessible object here. */ -- virtual ScAccessibleCsvControl* ImplCreateAccessible() = NULL; -+ virtual ScAccessibleCsvControl* ImplCreateAccessible() = 0; - }; - - diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile index 73c35c3f9da3..07313c68332f 100644 --- a/editors/openoffice.org-2-devel/Makefile +++ b/editors/openoffice.org-2-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= openoffice.org -PORTVERSION?= 2.0.${SNAPDATE} +PORTVERSION?= 2.2.${SNAPDATE} CATEGORIES+= editors java MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \ http://openoffice.lunarshells.com/sources/ \ @@ -71,11 +71,11 @@ IGNORE= install lang/perl5.8 then try again .endif CODELINE= 680 -RELEASE_NR= 2.0 -MILESTONE?= 191 +RELEASE_NR= 2.2 +MILESTONE?= 193 OOOTAG?= SRC680_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} -SNAPDATE= 20061101 +SNAPDATE= 20061110 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org2.0 @@ -98,9 +98,9 @@ PKGNAMESUFFIX?= -${LANG_SUFFIX} .if defined(WITH_GNUGCJ) GCCVER=41 BUILD_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt -BUILD_DEPEND+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat +BUILD_DEPENDS+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat RUN_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt -RUN_DEPEND+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat +RUN_DEPENDS+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat .else .if ${ARCH} == amd64 GCCVER=41 @@ -257,7 +257,7 @@ post-install: -e '/^Exec/s/printeradmin/spadmin/' \ ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop @${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak - @{LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \ + @${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \ ${PREFIX}/share/applications/${EXECBASE} @${PRINTF} "share/applications/${EXECBASE}\n" >> ${TMPPLIST} @for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \ diff --git a/editors/openoffice.org-2-devel/distinfo b/editors/openoffice.org-2-devel/distinfo index f8bcb1e7c861..890ac27b53b4 100644 --- a/editors/openoffice.org-2-devel/distinfo +++ b/editors/openoffice.org-2-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = e67107b02f384165f05e34b92dad3a13 -SHA256 (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = d616def00600a9b2299dea9617f232c1bea1adb192c2820e0d44aa430c6c6753 -SIZE (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = 261869653 +MD5 (openoffice.org2.0/OOo_SRC680_m193_source.tar.bz2) = 7d4ef341d25c8b947eaa3461f93a76d3 +SHA256 (openoffice.org2.0/OOo_SRC680_m193_source.tar.bz2) = 6e9642861190052d94e23ed26775722ea85e013379a9f6a704abc70d4bbef947 +SIZE (openoffice.org2.0/OOo_SRC680_m193_source.tar.bz2) = 262577471 MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org2.0/unowinreg.dll) = 6144 diff --git a/editors/openoffice.org-2-devel/files/Makefile.knobs b/editors/openoffice.org-2-devel/files/Makefile.knobs index 85ab949146a4..9ce1258cdf1c 100644 --- a/editors/openoffice.org-2-devel/files/Makefile.knobs +++ b/editors/openoffice.org-2-devel/files/Makefile.knobs @@ -31,6 +31,12 @@ CONFIGURE_ARGS+= --disable-gnome-vfs USE_GNOME+= gnomevfs2 .endif +.if defined(WITH_EVOLUTION2) +CONFIGURE_ARGS+= --enable-evolution2=yes +.else +USE_GNOME+= glib20 +.endif + .if defined(ALL_LOCALIZED_LANGS) CONFIGURE_ARGS+= --with-lang=ALL .else @@ -121,6 +127,11 @@ pre-fetch: @${ECHO} "You can compile OOo with gpc instead of libart by" @${ECHO} "make -DWITH_GPC" .endif +.if !defined(WITH_EVOLUTION2) + @${ECHO} + @${ECHO} "You can compile OOo with evolution2 support by" + @${ECHO} "make -DWITH_EVOLUTION2" +.endif @${ECHO} @${ECHO} "NOTICE:" @${ECHO} diff --git a/editors/openoffice.org-2-devel/files/generate.pl b/editors/openoffice.org-2-devel/files/generate.pl index 7af26109b80a..a43f27b306bf 100644 --- a/editors/openoffice.org-2-devel/files/generate.pl +++ b/editors/openoffice.org-2-devel/files/generate.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # generate full build shell script for OpenOffice.org # Whom: Maho Nakata <maho@FreeBSD.org> -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-devel/files/Attic/generate.pl,v 1.8 2005-11-25 23:22:20 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-devel/files/Attic/generate.pl,v 1.9 2006-11-12 22:11:34 maho Exp $ print "#!/bin/csh\n"; print "make deinstall clean\n"; diff --git a/editors/openoffice.org-2-devel/files/openoffice.org-wrapper b/editors/openoffice.org-2-devel/files/openoffice.org-wrapper index 857170b21172..9143d6ede1a0 100644 --- a/editors/openoffice.org-2-devel/files/openoffice.org-wrapper +++ b/editors/openoffice.org-2-devel/files/openoffice.org-wrapper @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-devel/files/Attic/openoffice.org-wrapper,v 1.2 2005-12-23 03:06:18 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-2-devel/files/Attic/openoffice.org-wrapper,v 1.3 2006-11-12 22:11:35 maho Exp $ oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/ program=`echo $0 | sed -e 's|.*-%%OOOTAG%%-||'` diff --git a/editors/openoffice.org-2-devel/files/patch-i71039 b/editors/openoffice.org-2-devel/files/patch-i71039 deleted file mode 100644 index 8f0897bc862b..000000000000 --- a/editors/openoffice.org-2-devel/files/patch-i71039 +++ /dev/null @@ -1,34 +0,0 @@ ---- binfilter/inc/bf_svx/svdobj.hxx.orig Mon Oct 23 13:47:55 2006 -+++ binfilter/inc/bf_svx/svdobj.hxx Mon Oct 23 13:48:08 2006 -@@ -265,7 +265,7 @@ - {} - virtual ~SdrObjUserData(); - -- virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL; -+ virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; - UINT32 GetInventor() const { return nInventor; } - UINT16 GetId() const { return nIdentifier; } - virtual void WriteData(SvStream& rOut); - ---- svx/inc/svdobj.hxx.orig Mon Oct 23 12:56:33 2006 -+++ svx/inc/svdobj.hxx Mon Oct 23 12:56:50 2006 -@@ -323,7 +323,7 @@ - {} - virtual ~SdrObjUserData(); - -- virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL; -+ virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; - UINT32 GetInventor() const { return nInventor; } - UINT16 GetId() const { return nIdentifier; } - //BFS01virtual void WriteData(SvStream& rOut); ---- sc/source/ui/inc/csvcontrol.hxx~ Fri Sep 9 06:17:47 2005 -+++ sc/source/ui/inc/csvcontrol.hxx Sat Nov 4 08:46:16 2006 -@@ -444,7 +444,7 @@ - - protected: - /** Derived classes create a new accessible object here. */ -- virtual ScAccessibleCsvControl* ImplCreateAccessible() = NULL; -+ virtual ScAccessibleCsvControl* ImplCreateAccessible() = 0; - }; - - diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index 73c35c3f9da3..07313c68332f 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= openoffice.org -PORTVERSION?= 2.0.${SNAPDATE} +PORTVERSION?= 2.2.${SNAPDATE} CATEGORIES+= editors java MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \ http://openoffice.lunarshells.com/sources/ \ @@ -71,11 +71,11 @@ IGNORE= install lang/perl5.8 then try again .endif CODELINE= 680 -RELEASE_NR= 2.0 -MILESTONE?= 191 +RELEASE_NR= 2.2 +MILESTONE?= 193 OOOTAG?= SRC680_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} -SNAPDATE= 20061101 +SNAPDATE= 20061110 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org2.0 @@ -98,9 +98,9 @@ PKGNAMESUFFIX?= -${LANG_SUFFIX} .if defined(WITH_GNUGCJ) GCCVER=41 BUILD_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt -BUILD_DEPEND+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat +BUILD_DEPENDS+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat RUN_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt -RUN_DEPEND+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat +RUN_DEPENDS+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat .else .if ${ARCH} == amd64 GCCVER=41 @@ -257,7 +257,7 @@ post-install: -e '/^Exec/s/printeradmin/spadmin/' \ ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop @${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak - @{LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \ + @${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \ ${PREFIX}/share/applications/${EXECBASE} @${PRINTF} "share/applications/${EXECBASE}\n" >> ${TMPPLIST} @for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \ diff --git a/editors/openoffice.org-3-devel/distinfo b/editors/openoffice.org-3-devel/distinfo index f8bcb1e7c861..890ac27b53b4 100644 --- a/editors/openoffice.org-3-devel/distinfo +++ b/editors/openoffice.org-3-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = e67107b02f384165f05e34b92dad3a13 -SHA256 (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = d616def00600a9b2299dea9617f232c1bea1adb192c2820e0d44aa430c6c6753 -SIZE (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = 261869653 +MD5 (openoffice.org2.0/OOo_SRC680_m193_source.tar.bz2) = 7d4ef341d25c8b947eaa3461f93a76d3 +SHA256 (openoffice.org2.0/OOo_SRC680_m193_source.tar.bz2) = 6e9642861190052d94e23ed26775722ea85e013379a9f6a704abc70d4bbef947 +SIZE (openoffice.org2.0/OOo_SRC680_m193_source.tar.bz2) = 262577471 MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org2.0/unowinreg.dll) = 6144 diff --git a/editors/openoffice.org-3-devel/files/Makefile.knobs b/editors/openoffice.org-3-devel/files/Makefile.knobs index 85ab949146a4..9ce1258cdf1c 100644 --- a/editors/openoffice.org-3-devel/files/Makefile.knobs +++ b/editors/openoffice.org-3-devel/files/Makefile.knobs @@ -31,6 +31,12 @@ CONFIGURE_ARGS+= --disable-gnome-vfs USE_GNOME+= gnomevfs2 .endif +.if defined(WITH_EVOLUTION2) +CONFIGURE_ARGS+= --enable-evolution2=yes +.else +USE_GNOME+= glib20 +.endif + .if defined(ALL_LOCALIZED_LANGS) CONFIGURE_ARGS+= --with-lang=ALL .else @@ -121,6 +127,11 @@ pre-fetch: @${ECHO} "You can compile OOo with gpc instead of libart by" @${ECHO} "make -DWITH_GPC" .endif +.if !defined(WITH_EVOLUTION2) + @${ECHO} + @${ECHO} "You can compile OOo with evolution2 support by" + @${ECHO} "make -DWITH_EVOLUTION2" +.endif @${ECHO} @${ECHO} "NOTICE:" @${ECHO} diff --git a/editors/openoffice.org-3-devel/files/generate.pl b/editors/openoffice.org-3-devel/files/generate.pl index 6ff54da56542..9b11bb60e16e 100644 --- a/editors/openoffice.org-3-devel/files/generate.pl +++ b/editors/openoffice.org-3-devel/files/generate.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # generate full build shell script for OpenOffice.org # Whom: Maho Nakata <maho@FreeBSD.org> -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-devel/files/Attic/generate.pl,v 1.8 2005-11-25 23:22:20 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-devel/files/Attic/generate.pl,v 1.9 2006-11-12 22:11:34 maho Exp $ print "#!/bin/csh\n"; print "make deinstall clean\n"; diff --git a/editors/openoffice.org-3-devel/files/openoffice.org-wrapper b/editors/openoffice.org-3-devel/files/openoffice.org-wrapper index b0a4c8178fea..10c99eae36a1 100644 --- a/editors/openoffice.org-3-devel/files/openoffice.org-wrapper +++ b/editors/openoffice.org-3-devel/files/openoffice.org-wrapper @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-devel/files/Attic/openoffice.org-wrapper,v 1.2 2005-12-23 03:06:18 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-3-devel/files/Attic/openoffice.org-wrapper,v 1.3 2006-11-12 22:11:35 maho Exp $ oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/ program=`echo $0 | sed -e 's|.*-%%OOOTAG%%-||'` diff --git a/editors/openoffice.org-3-devel/files/patch-i71039 b/editors/openoffice.org-3-devel/files/patch-i71039 deleted file mode 100644 index 8f0897bc862b..000000000000 --- a/editors/openoffice.org-3-devel/files/patch-i71039 +++ /dev/null @@ -1,34 +0,0 @@ ---- binfilter/inc/bf_svx/svdobj.hxx.orig Mon Oct 23 13:47:55 2006 -+++ binfilter/inc/bf_svx/svdobj.hxx Mon Oct 23 13:48:08 2006 -@@ -265,7 +265,7 @@ - {} - virtual ~SdrObjUserData(); - -- virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL; -+ virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; - UINT32 GetInventor() const { return nInventor; } - UINT16 GetId() const { return nIdentifier; } - virtual void WriteData(SvStream& rOut); - ---- svx/inc/svdobj.hxx.orig Mon Oct 23 12:56:33 2006 -+++ svx/inc/svdobj.hxx Mon Oct 23 12:56:50 2006 -@@ -323,7 +323,7 @@ - {} - virtual ~SdrObjUserData(); - -- virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL; -+ virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; - UINT32 GetInventor() const { return nInventor; } - UINT16 GetId() const { return nIdentifier; } - //BFS01virtual void WriteData(SvStream& rOut); ---- sc/source/ui/inc/csvcontrol.hxx~ Fri Sep 9 06:17:47 2005 -+++ sc/source/ui/inc/csvcontrol.hxx Sat Nov 4 08:46:16 2006 -@@ -444,7 +444,7 @@ - - protected: - /** Derived classes create a new accessible object here. */ -- virtual ScAccessibleCsvControl* ImplCreateAccessible() = NULL; -+ virtual ScAccessibleCsvControl* ImplCreateAccessible() = 0; - }; - - diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile index 73c35c3f9da3..07313c68332f 100644 --- a/editors/openoffice.org-vcltesttool/Makefile +++ b/editors/openoffice.org-vcltesttool/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= openoffice.org -PORTVERSION?= 2.0.${SNAPDATE} +PORTVERSION?= 2.2.${SNAPDATE} CATEGORIES+= editors java MASTER_SITES+= ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,misc/openoffice/developer/680_m${MILESTONE}/&,} \ http://openoffice.lunarshells.com/sources/ \ @@ -71,11 +71,11 @@ IGNORE= install lang/perl5.8 then try again .endif CODELINE= 680 -RELEASE_NR= 2.0 -MILESTONE?= 191 +RELEASE_NR= 2.2 +MILESTONE?= 193 OOOTAG?= SRC680_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} -SNAPDATE= 20061101 +SNAPDATE= 20061110 INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG} EXECBASE?= openoffice.org-${OOOTAG} DIST_SUBDIR= openoffice.org2.0 @@ -98,9 +98,9 @@ PKGNAMESUFFIX?= -${LANG_SUFFIX} .if defined(WITH_GNUGCJ) GCCVER=41 BUILD_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt -BUILD_DEPEND+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat +BUILD_DEPENDS+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat RUN_DEPENDS+= ${LOCALBASE}/libdata/ldconfig/gcc41-withgcjawt:${PORTSDIR}/lang/gcc41-withgcjawt -RUN_DEPEND+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat +RUN_DEPENDS+= ${LOCALBASE}/lib/jvm/java-gcj41/bin/java:${PORTSDIR}/java/java-gcj-compat .else .if ${ARCH} == amd64 GCCVER=41 @@ -257,7 +257,7 @@ post-install: -e '/^Exec/s/printeradmin/spadmin/' \ ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop @${RM} ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg/*.desktop.bak - @{LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \ + @${LN} -sf ${PREFIX}/${INSTALLATION_BASEDIR}/share/xdg \ ${PREFIX}/share/applications/${EXECBASE} @${PRINTF} "share/applications/${EXECBASE}\n" >> ${TMPPLIST} @for dir in `ls ${ICONS}/hicolor | ${GREP} -v CVS`; do \ diff --git a/editors/openoffice.org-vcltesttool/distinfo b/editors/openoffice.org-vcltesttool/distinfo index f8bcb1e7c861..890ac27b53b4 100644 --- a/editors/openoffice.org-vcltesttool/distinfo +++ b/editors/openoffice.org-vcltesttool/distinfo @@ -1,6 +1,6 @@ -MD5 (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = e67107b02f384165f05e34b92dad3a13 -SHA256 (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = d616def00600a9b2299dea9617f232c1bea1adb192c2820e0d44aa430c6c6753 -SIZE (openoffice.org2.0/OOo_SRC680_m191_source.tar.bz2) = 261869653 +MD5 (openoffice.org2.0/OOo_SRC680_m193_source.tar.bz2) = 7d4ef341d25c8b947eaa3461f93a76d3 +SHA256 (openoffice.org2.0/OOo_SRC680_m193_source.tar.bz2) = 6e9642861190052d94e23ed26775722ea85e013379a9f6a704abc70d4bbef947 +SIZE (openoffice.org2.0/OOo_SRC680_m193_source.tar.bz2) = 262577471 MD5 (openoffice.org2.0/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d SHA256 (openoffice.org2.0/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c SIZE (openoffice.org2.0/unowinreg.dll) = 6144 diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.knobs b/editors/openoffice.org-vcltesttool/files/Makefile.knobs index 85ab949146a4..9ce1258cdf1c 100644 --- a/editors/openoffice.org-vcltesttool/files/Makefile.knobs +++ b/editors/openoffice.org-vcltesttool/files/Makefile.knobs @@ -31,6 +31,12 @@ CONFIGURE_ARGS+= --disable-gnome-vfs USE_GNOME+= gnomevfs2 .endif +.if defined(WITH_EVOLUTION2) +CONFIGURE_ARGS+= --enable-evolution2=yes +.else +USE_GNOME+= glib20 +.endif + .if defined(ALL_LOCALIZED_LANGS) CONFIGURE_ARGS+= --with-lang=ALL .else @@ -121,6 +127,11 @@ pre-fetch: @${ECHO} "You can compile OOo with gpc instead of libart by" @${ECHO} "make -DWITH_GPC" .endif +.if !defined(WITH_EVOLUTION2) + @${ECHO} + @${ECHO} "You can compile OOo with evolution2 support by" + @${ECHO} "make -DWITH_EVOLUTION2" +.endif @${ECHO} @${ECHO} "NOTICE:" @${ECHO} diff --git a/editors/openoffice.org-vcltesttool/files/generate.pl b/editors/openoffice.org-vcltesttool/files/generate.pl index bfde49b32475..8e400c20d4fe 100644 --- a/editors/openoffice.org-vcltesttool/files/generate.pl +++ b/editors/openoffice.org-vcltesttool/files/generate.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl # generate full build shell script for OpenOffice.org # Whom: Maho Nakata <maho@FreeBSD.org> -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-vcltesttool/files/Attic/generate.pl,v 1.8 2005-11-25 23:22:20 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-vcltesttool/files/Attic/generate.pl,v 1.9 2006-11-12 22:11:34 maho Exp $ print "#!/bin/csh\n"; print "make deinstall clean\n"; diff --git a/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper b/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper index 382488f39adc..45c88c77163a 100644 --- a/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper +++ b/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper,v 1.2 2005-12-23 03:06:18 maho Exp $ +# $FreeBSD: /tmp/pcvs/ports/editors/openoffice.org-vcltesttool/files/openoffice.org-wrapper,v 1.3 2006-11-12 22:11:35 maho Exp $ oopath=%%PREFIX%%/%%INSTALLATION_BASEDIR%%/program/ program=`echo $0 | sed -e 's|.*-%%OOOTAG%%-||'` diff --git a/editors/openoffice.org-vcltesttool/files/patch-i71039 b/editors/openoffice.org-vcltesttool/files/patch-i71039 deleted file mode 100644 index 8f0897bc862b..000000000000 --- a/editors/openoffice.org-vcltesttool/files/patch-i71039 +++ /dev/null @@ -1,34 +0,0 @@ ---- binfilter/inc/bf_svx/svdobj.hxx.orig Mon Oct 23 13:47:55 2006 -+++ binfilter/inc/bf_svx/svdobj.hxx Mon Oct 23 13:48:08 2006 -@@ -265,7 +265,7 @@ - {} - virtual ~SdrObjUserData(); - -- virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL; -+ virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; - UINT32 GetInventor() const { return nInventor; } - UINT16 GetId() const { return nIdentifier; } - virtual void WriteData(SvStream& rOut); - ---- svx/inc/svdobj.hxx.orig Mon Oct 23 12:56:33 2006 -+++ svx/inc/svdobj.hxx Mon Oct 23 12:56:50 2006 -@@ -323,7 +323,7 @@ - {} - virtual ~SdrObjUserData(); - -- virtual SdrObjUserData* Clone(SdrObject* pObj1) const = NULL; -+ virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; - UINT32 GetInventor() const { return nInventor; } - UINT16 GetId() const { return nIdentifier; } - //BFS01virtual void WriteData(SvStream& rOut); ---- sc/source/ui/inc/csvcontrol.hxx~ Fri Sep 9 06:17:47 2005 -+++ sc/source/ui/inc/csvcontrol.hxx Sat Nov 4 08:46:16 2006 -@@ -444,7 +444,7 @@ - - protected: - /** Derived classes create a new accessible object here. */ -- virtual ScAccessibleCsvControl* ImplCreateAccessible() = NULL; -+ virtual ScAccessibleCsvControl* ImplCreateAccessible() = 0; - }; - - |