diff options
author | Martin Blapp <mbr@FreeBSD.org> | 2002-05-19 16:26:14 +0000 |
---|---|---|
committer | Martin Blapp <mbr@FreeBSD.org> | 2002-05-19 16:26:14 +0000 |
commit | 25d19e763c458b1910356b20ec39310c3fd79266 (patch) | |
tree | c9930d4b63bd5faea931e646bb62b513381ae8e7 | |
parent | Upgrade to 0.59. (diff) |
Fix the last commit. Since OO was only compileable in a little
timeframe on CURRENT, mark it broken for all CURRENT versions.
Beside that, the logic was wrong.
Notes
Notes:
svn path=/head/; revision=59473
-rw-r--r-- | editors/openoffice-1.0/Makefile | 15 | ||||
-rw-r--r-- | editors/openoffice.org-1.0/Makefile | 15 | ||||
-rw-r--r-- | editors/openoffice/Makefile | 15 |
3 files changed, 24 insertions, 21 deletions
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index 28840ad21534..11158a972fda 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -52,9 +52,9 @@ CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ .include <bsd.port.pre.mk> pre-fetch: -.if ${OSVERSION} > 500034 || ${OSVERSION} < 500034 +.if ${OSVERSION} > 500000 @${ECHO} - @${ECHO} OS-VERSION ${OSVERSION} + @${ECHO} OS-VERSION ${OSVERSION} too high @${ECHO} @${ECHO} Openoffice is currently broken on CURRENT and does @${ECHO} not yet work with GCC 3.1 @@ -64,12 +64,13 @@ pre-fetch: @${ECHO} @${FALSE} .endif -.if ${OSVERSION} < 450002 +.if ${OSVERSION} < 450005 @${ECHO} - @${ECHO} OS-VERSION ${OSVERSION} + @${ECHO} OS-VERSION ${OSVERSION} too low @${ECHO} @${ECHO} Openoffice need some important libc_r and - @${ECHO} gcc fixes to build. Please upgrade. + @${ECHO} gcc fixes to build. Please upgrade to 4.6 + @${ECHO} PRE-RELEASE or RELEASE. @${FALSE} .endif .if ${GCC_VERSION}!="2.95.2" && ${GCC_VERSION}!="2.95.3" && ${GCC_VERSION}!="2.95.4" @@ -94,8 +95,8 @@ pre-extract: @${ECHO} settings and add this to your KERNEL @${ECHO} configuration if necessary: @${ECHO} - @${ECHO} options MAXDSIZ="(1024*1024*1024)" - @${ECHO} options MAXSSIZ="(256*1024*1024)" + @${ECHO} options MAXDSIZ=\"\(1024*1024*1024\)\" + @${ECHO} options MAXSSIZ=\"\(256*1024*1024\)\" @${ECHO} .if !defined(DISPLAY) || ${DISPLAY} == "" @ ${ECHO} diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile index 28840ad21534..11158a972fda 100644 --- a/editors/openoffice.org-1.0/Makefile +++ b/editors/openoffice.org-1.0/Makefile @@ -52,9 +52,9 @@ CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ .include <bsd.port.pre.mk> pre-fetch: -.if ${OSVERSION} > 500034 || ${OSVERSION} < 500034 +.if ${OSVERSION} > 500000 @${ECHO} - @${ECHO} OS-VERSION ${OSVERSION} + @${ECHO} OS-VERSION ${OSVERSION} too high @${ECHO} @${ECHO} Openoffice is currently broken on CURRENT and does @${ECHO} not yet work with GCC 3.1 @@ -64,12 +64,13 @@ pre-fetch: @${ECHO} @${FALSE} .endif -.if ${OSVERSION} < 450002 +.if ${OSVERSION} < 450005 @${ECHO} - @${ECHO} OS-VERSION ${OSVERSION} + @${ECHO} OS-VERSION ${OSVERSION} too low @${ECHO} @${ECHO} Openoffice need some important libc_r and - @${ECHO} gcc fixes to build. Please upgrade. + @${ECHO} gcc fixes to build. Please upgrade to 4.6 + @${ECHO} PRE-RELEASE or RELEASE. @${FALSE} .endif .if ${GCC_VERSION}!="2.95.2" && ${GCC_VERSION}!="2.95.3" && ${GCC_VERSION}!="2.95.4" @@ -94,8 +95,8 @@ pre-extract: @${ECHO} settings and add this to your KERNEL @${ECHO} configuration if necessary: @${ECHO} - @${ECHO} options MAXDSIZ="(1024*1024*1024)" - @${ECHO} options MAXSSIZ="(256*1024*1024)" + @${ECHO} options MAXDSIZ=\"\(1024*1024*1024\)\" + @${ECHO} options MAXSSIZ=\"\(256*1024*1024\)\" @${ECHO} .if !defined(DISPLAY) || ${DISPLAY} == "" @ ${ECHO} diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile index 28840ad21534..11158a972fda 100644 --- a/editors/openoffice/Makefile +++ b/editors/openoffice/Makefile @@ -52,9 +52,9 @@ CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ .include <bsd.port.pre.mk> pre-fetch: -.if ${OSVERSION} > 500034 || ${OSVERSION} < 500034 +.if ${OSVERSION} > 500000 @${ECHO} - @${ECHO} OS-VERSION ${OSVERSION} + @${ECHO} OS-VERSION ${OSVERSION} too high @${ECHO} @${ECHO} Openoffice is currently broken on CURRENT and does @${ECHO} not yet work with GCC 3.1 @@ -64,12 +64,13 @@ pre-fetch: @${ECHO} @${FALSE} .endif -.if ${OSVERSION} < 450002 +.if ${OSVERSION} < 450005 @${ECHO} - @${ECHO} OS-VERSION ${OSVERSION} + @${ECHO} OS-VERSION ${OSVERSION} too low @${ECHO} @${ECHO} Openoffice need some important libc_r and - @${ECHO} gcc fixes to build. Please upgrade. + @${ECHO} gcc fixes to build. Please upgrade to 4.6 + @${ECHO} PRE-RELEASE or RELEASE. @${FALSE} .endif .if ${GCC_VERSION}!="2.95.2" && ${GCC_VERSION}!="2.95.3" && ${GCC_VERSION}!="2.95.4" @@ -94,8 +95,8 @@ pre-extract: @${ECHO} settings and add this to your KERNEL @${ECHO} configuration if necessary: @${ECHO} - @${ECHO} options MAXDSIZ="(1024*1024*1024)" - @${ECHO} options MAXSSIZ="(256*1024*1024)" + @${ECHO} options MAXDSIZ=\"\(1024*1024*1024\)\" + @${ECHO} options MAXSSIZ=\"\(256*1024*1024\)\" @${ECHO} .if !defined(DISPLAY) || ${DISPLAY} == "" @ ${ECHO} |