diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2007-12-13 10:39:39 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2007-12-13 10:39:39 +0000 |
| commit | a9c9ccf4245814405b7c66204748e155f014b8c1 (patch) | |
| tree | 0b008b238f1499a17329b0b54b2ba8cde47e471c /editors/openoffice.org-1.1 | |
| parent | Unbreak for 6. Build fails if the capacity of /tmp (diff) | |
Committed a wrong patch. This is the correct one.
Notes
Notes:
svn path=/head/; revision=203466
Diffstat (limited to 'editors/openoffice.org-1.1')
| -rw-r--r-- | editors/openoffice.org-1.1/Makefile | 19 | ||||
| -rw-r--r-- | editors/openoffice.org-1.1/files/patch-jvmaccess+source+sunversion.cxx | 11 |
2 files changed, 21 insertions, 9 deletions
diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile index d9f5c8776a7b..aa6c004adee2 100644 --- a/editors/openoffice.org-1.1/Makefile +++ b/editors/openoffice.org-1.1/Makefile @@ -47,6 +47,9 @@ JAVA_VENDOR= freebsd bsdjava .include <bsd.port.pre.mk> .include <${FILESDIR}/Makefile.localized> +.if ${OSVERSION} >= 700042 +BROKEN= fails to install; consider upgrading to editors/openoffice.org-2 +.endif LANG_EXT?= 01 LANG_CONFIGURE_ARG?= ENUS @@ -102,8 +105,7 @@ OOOCXX= ${CXX} .endif CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOOCXX}" \ CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - PATH="${WRKDIR}/bin:${PATH}" + LDFLAGS="-L${LOCALBASE}/lib" BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip \ @@ -168,13 +170,12 @@ post-extract: @cd ${WRKSRC} ; ${MV} moz moz.runtime ; ${MV} moz.old moz .endif -pre-build: - @${RM} -rf ${WRKDIR}/bin - @${MKDIR} ${WRKDIR}/bin - @${LN} -s `which ${CC}` ${WRKDIR}/bin/gcc - @${LN} -s `which ${CC}` ${WRKDIR}/bin/cc - @${LN} -s `which ${CXX}` ${WRKDIR}/bin/g++ - @${LN} -s `which ${CXX}` ${WRKDIR}/bin/c++ +pre-configure: +#Workaround for moz project, it uses gcc directly. + @${LN} -sf `which ${CC}` ${WRKSRC}/solenv/bin/gcc + @${LN} -sf `which ${CC}` ${WRKSRC}/solenv/bin/cc + @${LN} -sf `which ${CXX}` ${WRKSRC}/solenv/bin/g++ + @${LN} -sf `which ${CXX}` ${WRKSRC}/solenv/bin/c++ do-build: @cd ${WRKSRC} ; ./bootstrap diff --git a/editors/openoffice.org-1.1/files/patch-jvmaccess+source+sunversion.cxx b/editors/openoffice.org-1.1/files/patch-jvmaccess+source+sunversion.cxx index b334fb1339a0..bbed543f1021 100644 --- a/editors/openoffice.org-1.1/files/patch-jvmaccess+source+sunversion.cxx +++ b/editors/openoffice.org-1.1/files/patch-jvmaccess+source+sunversion.cxx @@ -10,8 +10,19 @@ it is not a good habit. in this patch we eleminate this. in the system. We add 100 as micro version number, so that we treat FreeBSD's version of java 1.4.1-p10 for example to 1.4.1_110. +3. Java version of 1.5.0_13-p7 will be treated as 1.5.0_13. -p part will be ignored. + --- jvmaccess/source/sunversion.cxx Thu Jun 16 21:45:26 2005 +++ jvmaccess/source/sunversion.cxx Sat Oct 22 16:42:01 2005 +@@ -193,7 +193,7 @@ + pCur ++; + // nPartPos ++; + } +- else if (nUpdatePart == 0 && (pCur == pEnd || isalpha(*pCur))) ++ else if (nUpdatePart == 0 && (pCur == pEnd || isalpha(*pCur) || (*pCur)=='-' )) + { + int len = pCur - pLast; + if (len >= 127) @@ -246,30 +247,22 @@ m_preRelease = Rel_RC2; #if defined FREEBSD || defined NETBSD |