13 files changed, 26 insertions, 13 deletions

diff --git a/mail/thunderbird-devel/files/mozconfig.in b/mail/thunderbird-devel/files/mozconfig.in
index baeba727c18d..2f7b3be42684 100644
--- a/mail/thunderbird-devel/files/mozconfig.in
+++ b/mail/thunderbird-devel/files/mozconfig.in
@@ -39,7 +39,6 @@ ac_add_options --with-system-mng=@LOCALBASE@
 ######################################################################
 # set compile/link features
 ac_add_options --with-pthreads
-ac_add_options --enable-strip
 ######################################################################
 # conditional from port Makefile
 if test -n "$WITH_REORDER"; then
@@ -49,9 +48,11 @@ else
 fi # test -n "$WITH_REORDER"
 if test -n "$WITH_DEBUG"; then
     ac_add_options --enable-debug
+    ac_add_options --disable-strip
 else
     ac_add_options --disable-debug
     ac_add_options --enable-optimize
+    ac_add_options --enable-strip
     export BUILD_OFFICIAL=1
     export MOZILLA_OFFICIAL=1
     mk_add_options BUILD_OFFICIAL=1
diff --git a/mail/thunderbird-esr/files/mozconfig.in b/mail/thunderbird-esr/files/mozconfig.in
index baeba727c18d..2f7b3be42684 100644
--- a/mail/thunderbird-esr/files/mozconfig.in
+++ b/mail/thunderbird-esr/files/mozconfig.in
@@ -39,7 +39,6 @@ ac_add_options --with-system-mng=@LOCALBASE@
 ######################################################################
 # set compile/link features
 ac_add_options --with-pthreads
-ac_add_options --enable-strip
 ######################################################################
 # conditional from port Makefile
 if test -n "$WITH_REORDER"; then
@@ -49,9 +48,11 @@ else
 fi # test -n "$WITH_REORDER"
 if test -n "$WITH_DEBUG"; then
     ac_add_options --enable-debug
+    ac_add_options --disable-strip
 else
     ac_add_options --disable-debug
     ac_add_options --enable-optimize
+    ac_add_options --enable-strip
     export BUILD_OFFICIAL=1
     export MOZILLA_OFFICIAL=1
     mk_add_options BUILD_OFFICIAL=1
diff --git a/mail/thunderbird/files/mozconfig.in b/mail/thunderbird/files/mozconfig.in
index baeba727c18d..2f7b3be42684 100644
--- a/mail/thunderbird/files/mozconfig.in
+++ b/mail/thunderbird/files/mozconfig.in
@@ -39,7 +39,6 @@ ac_add_options --with-system-mng=@LOCALBASE@
 ######################################################################
 # set compile/link features
 ac_add_options --with-pthreads
-ac_add_options --enable-strip
 ######################################################################
 # conditional from port Makefile
 if test -n "$WITH_REORDER"; then
@@ -49,9 +48,11 @@ else
 fi # test -n "$WITH_REORDER"
 if test -n "$WITH_DEBUG"; then
     ac_add_options --enable-debug
+    ac_add_options --disable-strip
 else
     ac_add_options --disable-debug
     ac_add_options --enable-optimize
+    ac_add_options --enable-strip
     export BUILD_OFFICIAL=1
     export MOZILLA_OFFICIAL=1
     mk_add_options BUILD_OFFICIAL=1
diff --git a/mail/thunderbird3/files/mozconfig.in b/mail/thunderbird3/files/mozconfig.in
index baeba727c18d..2f7b3be42684 100644
--- a/mail/thunderbird3/files/mozconfig.in
+++ b/mail/thunderbird3/files/mozconfig.in
@@ -39,7 +39,6 @@ ac_add_options --with-system-mng=@LOCALBASE@
 ######################################################################
 # set compile/link features
 ac_add_options --with-pthreads
-ac_add_options --enable-strip
 ######################################################################
 # conditional from port Makefile
 if test -n "$WITH_REORDER"; then
@@ -49,9 +48,11 @@ else
 fi # test -n "$WITH_REORDER"
 if test -n "$WITH_DEBUG"; then
     ac_add_options --enable-debug
+    ac_add_options --disable-strip
 else
     ac_add_options --disable-debug
     ac_add_options --enable-optimize
+    ac_add_options --enable-strip
     export BUILD_OFFICIAL=1
     export MOZILLA_OFFICIAL=1
     mk_add_options BUILD_OFFICIAL=1
diff --git a/www/firefox-devel/files/mozconfig.in b/www/firefox-devel/files/mozconfig.in
index 69405237bce0..a0d469df586e 100644
--- a/www/firefox-devel/files/mozconfig.in
+++ b/www/firefox-devel/files/mozconfig.in
@@ -32,7 +32,6 @@ ac_add_options --with-system-mng=@LOCALBASE@
 # set compile/link features
 ac_add_options --with-pthreads
 ac_add_options --enable-reorder
-ac_add_options --enable-strip
 ######################################################################
 # disable unneeded/unavailable
 ac_add_options --disable-auto-deps
@@ -48,9 +47,11 @@ ac_add_options --enable-extensions=cookie,xml-rpc,xmlextras,p3p,pref,transformii
 # conditional from port Makefile
 if test -n "$WITH_DEBUG"; then
     ac_add_options --enable-debug
+    ac_add_options --disable-strip
 else
     ac_add_options --disable-debug
     ac_add_options --enable-optimize
+    ac_add_options --enable-strip
 fi # test -n "$WITH_DEBUG"
 if test -n "$WITH_LOGGING"; then
     ac_add_options --enable-logging
diff --git a/www/firefox-esr/files/mozconfig.in b/www/firefox-esr/files/mozconfig.in
index 69405237bce0..a0d469df586e 100644
--- a/www/firefox-esr/files/mozconfig.in
+++ b/www/firefox-esr/files/mozconfig.in
@@ -32,7 +32,6 @@ ac_add_options --with-system-mng=@LOCALBASE@
 # set compile/link features
 ac_add_options --with-pthreads
 ac_add_options --enable-reorder
-ac_add_options --enable-strip
 ######################################################################
 # disable unneeded/unavailable
 ac_add_options --disable-auto-deps
@@ -48,9 +47,11 @@ ac_add_options --enable-extensions=cookie,xml-rpc,xmlextras,p3p,pref,transformii
 # conditional from port Makefile
 if test -n "$WITH_DEBUG"; then
     ac_add_options --enable-debug
+    ac_add_options --disable-strip
 else
     ac_add_options --disable-debug
     ac_add_options --enable-optimize
+    ac_add_options --enable-strip
 fi # test -n "$WITH_DEBUG"
 if test -n "$WITH_LOGGING"; then
     ac_add_options --enable-logging
diff --git a/www/firefox/files/mozconfig.in b/www/firefox/files/mozconfig.in
index 69405237bce0..a0d469df586e 100644
--- a/www/firefox/files/mozconfig.in
+++ b/www/firefox/files/mozconfig.in
@@ -32,7 +32,6 @@ ac_add_options --with-system-mng=@LOCALBASE@
 # set compile/link features
 ac_add_options --with-pthreads
 ac_add_options --enable-reorder
-ac_add_options --enable-strip
 ######################################################################
 # disable unneeded/unavailable
 ac_add_options --disable-auto-deps
@@ -48,9 +47,11 @@ ac_add_options --enable-extensions=cookie,xml-rpc,xmlextras,p3p,pref,transformii
 # conditional from port Makefile
 if test -n "$WITH_DEBUG"; then
     ac_add_options --enable-debug
+    ac_add_options --disable-strip
 else
     ac_add_options --disable-debug
     ac_add_options --enable-optimize
+    ac_add_options --enable-strip
 fi # test -n "$WITH_DEBUG"
 if test -n "$WITH_LOGGING"; then
     ac_add_options --enable-logging
diff --git a/www/firefox10/files/mozconfig.in b/www/firefox10/files/mozconfig.in
index 69405237bce0..a0d469df586e 100644
--- a/www/firefox10/files/mozconfig.in
+++ b/www/firefox10/files/mozconfig.in
@@ -32,7 +32,6 @@ ac_add_options --with-system-mng=@LOCALBASE@
 # set compile/link features
 ac_add_options --with-pthreads
 ac_add_options --enable-reorder
-ac_add_options --enable-strip
 ######################################################################
 # disable unneeded/unavailable
 ac_add_options --disable-auto-deps
@@ -48,9 +47,11 @@ ac_add_options --enable-extensions=cookie,xml-rpc,xmlextras,p3p,pref,transformii
 # conditional from port Makefile
 if test -n "$WITH_DEBUG"; then
     ac_add_options --enable-debug
+    ac_add_options --disable-strip
 else
     ac_add_options --disable-debug
     ac_add_options --enable-optimize
+    ac_add_options --enable-strip
 fi # test -n "$WITH_DEBUG"
 if test -n "$WITH_LOGGING"; then
     ac_add_options --enable-logging
diff --git a/www/firefox15/files/mozconfig.in b/www/firefox15/files/mozconfig.in
index 69405237bce0..a0d469df586e 100644
--- a/www/firefox15/files/mozconfig.in
+++ b/www/firefox15/files/mozconfig.in
@@ -32,7 +32,6 @@ ac_add_options --with-system-mng=@LOCALBASE@
 # set compile/link features
 ac_add_options --with-pthreads
 ac_add_options --enable-reorder
-ac_add_options --enable-strip
 ######################################################################
 # disable unneeded/unavailable
 ac_add_options --disable-auto-deps
@@ -48,9 +47,11 @@ ac_add_options --enable-extensions=cookie,xml-rpc,xmlextras,p3p,pref,transformii
 # conditional from port Makefile
 if test -n "$WITH_DEBUG"; then
     ac_add_options --enable-debug
+    ac_add_options --disable-strip
 else
     ac_add_options --disable-debug
     ac_add_options --enable-optimize
+    ac_add_options --enable-strip
 fi # test -n "$WITH_DEBUG"
 if test -n "$WITH_LOGGING"; then
     ac_add_options --enable-logging
diff --git a/www/firefox3-devel/files/mozconfig.in b/www/firefox3-devel/files/mozconfig.in
index 69405237bce0..a0d469df586e 100644
--- a/www/firefox3-devel/files/mozconfig.in
+++ b/www/firefox3-devel/files/mozconfig.in
@@ -32,7 +32,6 @@ ac_add_options --with-system-mng=@LOCALBASE@
 # set compile/link features
 ac_add_options --with-pthreads
 ac_add_options --enable-reorder
-ac_add_options --enable-strip
 ######################################################################
 # disable unneeded/unavailable
 ac_add_options --disable-auto-deps
@@ -48,9 +47,11 @@ ac_add_options --enable-extensions=cookie,xml-rpc,xmlextras,p3p,pref,transformii
 # conditional from port Makefile
 if test -n "$WITH_DEBUG"; then
     ac_add_options --enable-debug
+    ac_add_options --disable-strip
 else
     ac_add_options --disable-debug
     ac_add_options --enable-optimize
+    ac_add_options --enable-strip
 fi # test -n "$WITH_DEBUG"
 if test -n "$WITH_LOGGING"; then
     ac_add_options --enable-logging
diff --git a/www/firefox35/files/mozconfig.in b/www/firefox35/files/mozconfig.in
index 69405237bce0..a0d469df586e 100644
--- a/www/firefox35/files/mozconfig.in
+++ b/www/firefox35/files/mozconfig.in
@@ -32,7 +32,6 @@ ac_add_options --with-system-mng=@LOCALBASE@
 # set compile/link features
 ac_add_options --with-pthreads
 ac_add_options --enable-reorder
-ac_add_options --enable-strip
 ######################################################################
 # disable unneeded/unavailable
 ac_add_options --disable-auto-deps
@@ -48,9 +47,11 @@ ac_add_options --enable-extensions=cookie,xml-rpc,xmlextras,p3p,pref,transformii
 # conditional from port Makefile
 if test -n "$WITH_DEBUG"; then
     ac_add_options --enable-debug
+    ac_add_options --disable-strip
 else
     ac_add_options --disable-debug
     ac_add_options --enable-optimize
+    ac_add_options --enable-strip
 fi # test -n "$WITH_DEBUG"
 if test -n "$WITH_LOGGING"; then
     ac_add_options --enable-logging
diff --git a/www/firefox36/files/mozconfig.in b/www/firefox36/files/mozconfig.in
index 69405237bce0..a0d469df586e 100644
--- a/www/firefox36/files/mozconfig.in
+++ b/www/firefox36/files/mozconfig.in
@@ -32,7 +32,6 @@ ac_add_options --with-system-mng=@LOCALBASE@
 # set compile/link features
 ac_add_options --with-pthreads
 ac_add_options --enable-reorder
-ac_add_options --enable-strip
 ######################################################################
 # disable unneeded/unavailable
 ac_add_options --disable-auto-deps
@@ -48,9 +47,11 @@ ac_add_options --enable-extensions=cookie,xml-rpc,xmlextras,p3p,pref,transformii
 # conditional from port Makefile
 if test -n "$WITH_DEBUG"; then
     ac_add_options --enable-debug
+    ac_add_options --disable-strip
 else
     ac_add_options --disable-debug
     ac_add_options --enable-optimize
+    ac_add_options --enable-strip
 fi # test -n "$WITH_DEBUG"
 if test -n "$WITH_LOGGING"; then
     ac_add_options --enable-logging
diff --git a/www/flock/files/mozconfig.in b/www/flock/files/mozconfig.in
index 69405237bce0..a0d469df586e 100644
--- a/www/flock/files/mozconfig.in
+++ b/www/flock/files/mozconfig.in
@@ -32,7 +32,6 @@ ac_add_options --with-system-mng=@LOCALBASE@
 # set compile/link features
 ac_add_options --with-pthreads
 ac_add_options --enable-reorder
-ac_add_options --enable-strip
 ######################################################################
 # disable unneeded/unavailable
 ac_add_options --disable-auto-deps
@@ -48,9 +47,11 @@ ac_add_options --enable-extensions=cookie,xml-rpc,xmlextras,p3p,pref,transformii
 # conditional from port Makefile
 if test -n "$WITH_DEBUG"; then
     ac_add_options --enable-debug
+    ac_add_options --disable-strip
 else
     ac_add_options --disable-debug
     ac_add_options --enable-optimize
+    ac_add_options --enable-strip
 fi # test -n "$WITH_DEBUG"
 if test -n "$WITH_LOGGING"; then
     ac_add_options --enable-logging