diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2008-04-02 00:48:06 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2008-04-02 00:48:06 +0000 |
| commit | 2c5781336e4d9561658236a0066f4eadfc68983b (patch) | |
| tree | 6029d3a68e0643051a3773193af206f9d9adc8ff /editors/openoffice.org-2-RC | |
| parent | 79170a22d2d35dfa5d43a2e614d0dd117d1eff3c (diff) | |
| download | ports-2c5781336e4d9561658236a0066f4eadfc68983b.tar.gz ports-2c5781336e4d9561658236a0066f4eadfc68983b.zip | |
1. Adding --with-system-zlib. Base crashes because of broken zlib integration.
Bump portrevision for openoffice.org-2 port, accordingly.
2. WITH_DEBUG now implies --enable-debug --enable-symbols=TRUE --enable-dbgutil
http://www.freebsd.org/cgi/query-pr.cgi?pr=107167
http://www.openoffice.org/issues/show_bug.cgi?id=85124
http://thread.gmane.org/gmane.os.freebsd.devel.openoffice/1700/focus=1707
3. Remove CODELINE. Not used anymore.
Thanks for investigations and suggestions:
Marcin Cieslak <saper@system.pl>.
PR: 107167
Submitted by: User1001 [1]
Notes
Notes:
svn path=/head/; revision=210354
Diffstat (limited to 'editors/openoffice.org-2-RC')
| -rw-r--r-- | editors/openoffice.org-2-RC/Makefile | 3 | ||||
| -rw-r--r-- | editors/openoffice.org-2-RC/files/Makefile.knobs | 12 |
2 files changed, 4 insertions, 11 deletions
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile index 90a515300ec4..c61303901bc0 100644 --- a/editors/openoffice.org-2-RC/Makefile +++ b/editors/openoffice.org-2-RC/Makefile @@ -71,7 +71,6 @@ FREEBSD_ENV_SET= FreeBSDAMDEnv.Set FREEBSD_ENV_SET= FreeBSDX86Env.Set .endif -CODELINE= 680 MILESTONE?= 12 OOOTAG?= OOH680_m${MILESTONE} OOOSRC?= OOo_${OOOTAG}_source${EXTRACT_SUFX} @@ -142,7 +141,7 @@ NUMOFPROCESSES?= 1 CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \ --with-gnu-patch=${LOCALBASE}/bin/gpatch \ --enable-crashdump=yes \ - --enable-symbols=SMALL + --with-system-zlib .if ${ARCH} == amd64 WITHOUT_MOZILLA= yes LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost diff --git a/editors/openoffice.org-2-RC/files/Makefile.knobs b/editors/openoffice.org-2-RC/files/Makefile.knobs index a24d1fdea61f..e9a84ffd26d1 100644 --- a/editors/openoffice.org-2-RC/files/Makefile.knobs +++ b/editors/openoffice.org-2-RC/files/Makefile.knobs @@ -49,11 +49,7 @@ CONFIGURE_ARGS+= --with-lang=${LOCALIZED_LANG} .endif .if defined(WITH_DEBUG) -.if ${WITH_DEBUG} == 2 -CONFIGURE_ARGS+= --enable-debug -.else -CONFIGURE_ARGS+= --enable-symbols -.endif +CONFIGURE_ARGS+= --enable-debug --enable-symbols=TRUE --enable-dbgutil .endif pre-fetch: @@ -75,10 +71,8 @@ pre-fetch: @${ECHO} "OPTIONS:" .if !defined(WITH_DEBUG) @${ECHO} - @${ECHO} "You can compile OOo with debug symbols with WITH_DEBUG=1" - @${ECHO} - @${ECHO} "If you set WITH_DEBUG=2, you add internal" - @${ECHO} "OOo debug support." + @${ECHO} "You can compile OOo with debug symbols/supports with" + @${ECHO} "make -DWITH_DEBUG" .endif .if !defined(WITHOUT_MOZILLA) @${ECHO} |