Date: Thu, 12 Jul 2012 21:57:08 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r873 - in branches/experimental: Mk mail/thunderbird-esr/files mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/libxul/files www/seamonkey/files Message-ID: <201207122157.q6CLv8W9000314@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Thu Jul 12 21:57:07 2012
New Revision: 873
Log:
get rid of zlib patch
Deleted:
branches/experimental/mail/thunderbird-esr/files/patch-configure.in
branches/experimental/mail/thunderbird/files/patch-configure.in
branches/experimental/www/seamonkey/files/patch-configure.in
Modified:
branches/experimental/Mk/bsd.gecko.mk
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-configure.in
branches/experimental/mail/thunderbird/files/patch-mozilla-configure.in
branches/experimental/www/firefox-esr/files/patch-configure.in
branches/experimental/www/firefox-nightly/files/patch-configure.in
branches/experimental/www/firefox/files/patch-configure.in
branches/experimental/www/libxul/files/patch-configure.in
branches/experimental/www/seamonkey/files/patch-mozilla-configure.in
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Thu Jul 12 21:56:56 2012 (r872)
+++ branches/experimental/Mk/bsd.gecko.mk Thu Jul 12 21:57:07 2012 (r873)
@@ -655,7 +655,7 @@
MOZ_OPTIONS+= --enable-necko-protocols=${MOZ_PROTOCOLS}
.endif
# others
-MOZ_OPTIONS+= --with-system-zlib=/usr \
+MOZ_OPTIONS+= --with-system-zlib \
--disable-auto-deps \
--disable-debug-symbols \
--disable-glibtest \
Deleted: branches/experimental/mail/thunderbird-esr/files/patch-configure.in
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-configure.in Thu Jul 12 21:57:07 2012 (r872)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- configure.in.orig 2011-12-19 14:48:06.000000000 +0100
-+++ configure.in 2011-12-19 15:51:19.000000000 +0100
-@@ -4383,7 +4386,7 @@
- LDFLAGS=$_SAVE_LDFLAGS
- LIBS=$_SAVE_LIBS
-
--if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
-+if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
- ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
- ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
- fi
Modified: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-configure.in
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-configure.in Thu Jul 12 21:56:56 2012 (r872)
+++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-configure.in Thu Jul 12 21:57:07 2012 (r873)
@@ -50,15 +50,6 @@
CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
-@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS
- LDFLAGS=$_SAVE_LDFLAGS
- LIBS=$_SAVE_LIBS
-
--if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
-+if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
- ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
- ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
- fi
@@ -6022,6 +6024,14 @@
VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
VPX_X86_ASM=1
Deleted: branches/experimental/mail/thunderbird/files/patch-configure.in
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-configure.in Thu Jul 12 21:57:07 2012 (r872)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- configure.in.orig 2011-12-19 14:48:06.000000000 +0100
-+++ configure.in 2011-12-19 15:51:19.000000000 +0100
-@@ -4383,7 +4386,7 @@
- LDFLAGS=$_SAVE_LDFLAGS
- LIBS=$_SAVE_LIBS
-
--if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
-+if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
- ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
- ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
- fi
Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-configure.in
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-configure.in Thu Jul 12 21:56:56 2012 (r872)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-configure.in Thu Jul 12 21:57:07 2012 (r873)
@@ -23,15 +23,6 @@
CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
-@@ -4580,7 +4580,7 @@
- LDFLAGS=$_SAVE_LDFLAGS
- LIBS=$_SAVE_LIBS
-
--if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
-+if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
- ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
- ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
- fi
@@ -5903,6 +5903,14 @@
VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
VPX_X86_ASM=1
Modified: branches/experimental/www/firefox-esr/files/patch-configure.in
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-configure.in Thu Jul 12 21:56:56 2012 (r872)
+++ branches/experimental/www/firefox-esr/files/patch-configure.in Thu Jul 12 21:57:07 2012 (r873)
@@ -50,15 +50,6 @@
CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
-@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS
- LDFLAGS=$_SAVE_LDFLAGS
- LIBS=$_SAVE_LIBS
-
--if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
-+if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
- ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
- ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
- fi
@@ -6022,6 +6024,14 @@
VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
VPX_X86_ASM=1
Modified: branches/experimental/www/firefox-nightly/files/patch-configure.in
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-configure.in Thu Jul 12 21:56:56 2012 (r872)
+++ branches/experimental/www/firefox-nightly/files/patch-configure.in Thu Jul 12 21:57:07 2012 (r873)
@@ -23,15 +23,6 @@
CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
-@@ -4101,7 +4105,7 @@ CFLAGS=$_SAVE_CFLAGS
- LDFLAGS=$_SAVE_LDFLAGS
- LIBS=$_SAVE_LIBS
-
--if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$MOZ_NATIVE_ZLIB" = 1; then
-+if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$MOZ_NATIVE_ZLIB" = 1; then
- MOZ_ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
- MOZ_ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
- fi
@@ -6022,6 +6024,14 @@
VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
VPX_X86_ASM=1
Modified: branches/experimental/www/firefox/files/patch-configure.in
==============================================================================
--- branches/experimental/www/firefox/files/patch-configure.in Thu Jul 12 21:56:56 2012 (r872)
+++ branches/experimental/www/firefox/files/patch-configure.in Thu Jul 12 21:57:07 2012 (r873)
@@ -23,15 +23,6 @@
CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
-@@ -4808,7 +4810,7 @@
- LDFLAGS=$_SAVE_LDFLAGS
- LIBS=$_SAVE_LIBS
-
--if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
-+if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
- ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
- ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
- fi
@@ -5903,6 +5903,14 @@
VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
VPX_X86_ASM=1
Modified: branches/experimental/www/libxul/files/patch-configure.in
==============================================================================
--- branches/experimental/www/libxul/files/patch-configure.in Thu Jul 12 21:56:56 2012 (r872)
+++ branches/experimental/www/libxul/files/patch-configure.in Thu Jul 12 21:57:07 2012 (r873)
@@ -50,15 +50,6 @@
CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
-@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS
- LDFLAGS=$_SAVE_LDFLAGS
- LIBS=$_SAVE_LIBS
-
--if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
-+if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
- ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
- ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
- fi
@@ -6022,6 +6024,14 @@
VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
VPX_X86_ASM=1
Deleted: branches/experimental/www/seamonkey/files/patch-configure.in
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-configure.in Thu Jul 12 21:57:07 2012 (r872)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- configure.in.orig 2011-12-17 18:35:47.000000000 +0100
-+++ configure.in 2011-12-19 15:57:09.000000000 +0100
-@@ -4383,7 +4386,7 @@
- LDFLAGS=$_SAVE_LDFLAGS
- LIBS=$_SAVE_LIBS
-
--if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
-+if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
- ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
- ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
- fi
Modified: branches/experimental/www/seamonkey/files/patch-mozilla-configure.in
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-configure.in Thu Jul 12 21:56:56 2012 (r872)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-configure.in Thu Jul 12 21:57:07 2012 (r873)
@@ -23,15 +23,6 @@
CFLAGS=$_SAVE_CFLAGS
LDFLAGS=$_SAVE_LDFLAGS
LIBS=$_SAVE_LIBS
-@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS
- LDFLAGS=$_SAVE_LDFLAGS
- LIBS=$_SAVE_LIBS
-
--if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
-+if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then
- ZLIB_CFLAGS="-I${ZLIB_DIR}/include"
- ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}"
- fi
@@ -5903,6 +5903,14 @@
VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC"
VPX_X86_ASM=1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207122157.q6CLv8W9000314>