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]

18 files changed, 39 insertions, 94 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index 540728bcd99f..a158676e2441 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -145,7 +145,7 @@ MAXMODULES?=	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-3-devel/files/Makefile.knobs b/editors/openoffice-3-devel/files/Makefile.knobs
index 124ee636dbe4..8889aa81d382 100644
--- a/editors/openoffice-3-devel/files/Makefile.knobs
+++ b/editors/openoffice-3-devel/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}
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 93ecaa92d932..2834de940220 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	${OOOVERSION}
+PORTREVISION?=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://openoffice.lunarshells.com/sources/ \
@@ -140,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-3/files/Makefile.knobs b/editors/openoffice-3/files/Makefile.knobs
index a24d1fdea61f..e9a84ffd26d1 100644
--- a/editors/openoffice-3/files/Makefile.knobs
+++ b/editors/openoffice-3/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}
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}
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index ac0ec6313a2f..7b1b1b1efc5f 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -72,7 +72,6 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-CODELINE=		680
 MILESTONE?=		248
 OOOTAG?=		SRC680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
@@ -147,7 +146,7 @@ MAXMODULES?=	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-devel/files/Makefile.knobs b/editors/openoffice.org-2-devel/files/Makefile.knobs
index a24d1fdea61f..e9a84ffd26d1 100644
--- a/editors/openoffice.org-2-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-2-devel/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}
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index 93ecaa92d932..2834de940220 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	${OOOVERSION}
+PORTREVISION?=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://openoffice.lunarshells.com/sources/ \
@@ -140,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/files/Makefile.knobs b/editors/openoffice.org-2/files/Makefile.knobs
index a24d1fdea61f..e9a84ffd26d1 100644
--- a/editors/openoffice.org-2/files/Makefile.knobs
+++ b/editors/openoffice.org-2/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}
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 90a515300ec4..c61303901bc0 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-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-3-RC/files/Makefile.knobs b/editors/openoffice.org-3-RC/files/Makefile.knobs
index a24d1fdea61f..e9a84ffd26d1 100644
--- a/editors/openoffice.org-3-RC/files/Makefile.knobs
+++ b/editors/openoffice.org-3-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}
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index 540728bcd99f..a158676e2441 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -145,7 +145,7 @@ MAXMODULES?=	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-3-devel/files/Makefile.knobs b/editors/openoffice.org-3-devel/files/Makefile.knobs
index 124ee636dbe4..8889aa81d382 100644
--- a/editors/openoffice.org-3-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-3-devel/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}
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index 93ecaa92d932..2834de940220 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	${OOOVERSION}
+PORTREVISION?=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://openoffice.lunarshells.com/sources/ \
@@ -140,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-3/files/Makefile.knobs b/editors/openoffice.org-3/files/Makefile.knobs
index a24d1fdea61f..e9a84ffd26d1 100644
--- a/editors/openoffice.org-3/files/Makefile.knobs
+++ b/editors/openoffice.org-3/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}
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index ac0ec6313a2f..7b1b1b1efc5f 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -72,7 +72,6 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-CODELINE=		680
 MILESTONE?=		248
 OOOTAG?=		SRC680_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
@@ -147,7 +146,7 @@ MAXMODULES?=	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-vcltesttool/files/Makefile.knobs b/editors/openoffice.org-vcltesttool/files/Makefile.knobs
index a24d1fdea61f..e9a84ffd26d1 100644
--- a/editors/openoffice.org-vcltesttool/files/Makefile.knobs
+++ b/editors/openoffice.org-vcltesttool/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}