Date: Sat, 30 Jun 2012 22:55:13 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r820 - in branches/experimental: mail/thunderbird mail/thunderbird-esr mail/thunderbird-esr/files mail/thunderbird/files mail/thunderbird3 mail/thunderbird3/files www/firefox www/firefox-esr www/firefox-esr/files www/firefox-nightly www/firefox-nightly/files www/firefox/files www/firefox36 www/firefox36/files www/kompozer www/kompozer/files www/libxul www/libxul/files www/libxul19 www/libxul19/files www/seamonkey www/seamonkey/files Message-ID: <201206302255.q5UMtDYI036382@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sat Jun 30 22:55:12 2012
New Revision: 820
Log:
cut down on the number of substitutions
Deleted:
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-db-sqlite3-src-Makefile.in
branches/experimental/mail/thunderbird/files/patch-mozilla-db-sqlite3-src-Makefile.in
branches/experimental/mail/thunderbird3/files/patch-mozilla-db-sqlite3-src-Makefile.in
branches/experimental/mail/thunderbird3/files/patch-mozilla-storage-build-Makefile.in
branches/experimental/www/firefox-esr/files/patch-db_sqlite3_src_Makefile.in
branches/experimental/www/firefox-nightly/files/patch-db_sqlite3_src_Makefile.in
branches/experimental/www/firefox/files/patch-db_sqlite3_src_Makefile.in
branches/experimental/www/firefox36/files/patch-db_sqlite3_src_Makefile.in
branches/experimental/www/firefox36/files/patch-storage_build_Makefile.in
branches/experimental/www/kompozer/files/patch-storage_build_Makefile.in
branches/experimental/www/libxul/files/patch-db_sqlite3_src_Makefile.in
branches/experimental/www/libxul19/files/patch-db_sqlite3_src_Makefile.in
branches/experimental/www/libxul19/files/patch-storage_build_Makefile.in
branches/experimental/www/seamonkey/files/patch-suite-build-Makefile.in
Modified:
branches/experimental/mail/thunderbird-esr/Makefile
branches/experimental/mail/thunderbird-esr/files/patch-configure.in
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-js-src-config-mkdepend-Makefile.in
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-js-src-config_config.mk
branches/experimental/mail/thunderbird-esr/files/patch-mozilla-toolkit-library-Makefile.in
branches/experimental/mail/thunderbird/Makefile
branches/experimental/mail/thunderbird/files/patch-configure.in
branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-config-mkdepend-Makefile.in
branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-config_config.mk
branches/experimental/mail/thunderbird/files/patch-mozilla-toolkit-library-Makefile.in
branches/experimental/mail/thunderbird3/Makefile
branches/experimental/mail/thunderbird3/files/patch-mozilla-js-src-config-mkdepend-Makefile.in
branches/experimental/www/firefox-esr/Makefile
branches/experimental/www/firefox-esr/files/patch-config_config.mk
branches/experimental/www/firefox-esr/files/patch-config_mkdepend_Makefile.in
branches/experimental/www/firefox-esr/files/patch-js-src-config-mkdepend_Makefile.in
branches/experimental/www/firefox-esr/files/patch-js-src-config_config.mk
branches/experimental/www/firefox-esr/files/patch-toolkit_library_Makefile.in
branches/experimental/www/firefox-nightly/Makefile
branches/experimental/www/firefox-nightly/files/patch-config_config.mk
branches/experimental/www/firefox-nightly/files/patch-config_mkdepend_Makefile.in
branches/experimental/www/firefox-nightly/files/patch-js-src-config-mkdepend_Makefile.in
branches/experimental/www/firefox-nightly/files/patch-js-src-config_config.mk
branches/experimental/www/firefox-nightly/files/patch-toolkit_library_Makefile.in
branches/experimental/www/firefox/Makefile
branches/experimental/www/firefox/files/patch-config_config.mk
branches/experimental/www/firefox/files/patch-config_mkdepend_Makefile.in
branches/experimental/www/firefox/files/patch-js-src-config-mkdepend_Makefile.in
branches/experimental/www/firefox/files/patch-js-src-config_config.mk
branches/experimental/www/firefox/files/patch-toolkit_library_Makefile.in
branches/experimental/www/firefox36/Makefile
branches/experimental/www/firefox36/files/patch-js-src-config-mkdepend_Makefile.in
branches/experimental/www/firefox36/files/patch-js-src-config_config.mk
branches/experimental/www/kompozer/Makefile
branches/experimental/www/libxul/Makefile
branches/experimental/www/libxul/files/patch-js-src-config-mkdepend-Makefile.in
branches/experimental/www/libxul/files/patch-js-src-config_config.mk
branches/experimental/www/libxul/files/patch-toolkit_library_Makefile.in
branches/experimental/www/libxul19/Makefile
branches/experimental/www/libxul19/files/patch-configure.in
branches/experimental/www/libxul19/files/patch-js-src-config-mkdepend-Makefile.in
branches/experimental/www/seamonkey/Makefile
branches/experimental/www/seamonkey/files/patch-configure.in
branches/experimental/www/seamonkey/files/patch-mozilla-js-src-config-mkdepend-Makefile.in
branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in
Modified: branches/experimental/mail/thunderbird-esr/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-esr/Makefile Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/mail/thunderbird-esr/Makefile Sat Jun 30 22:55:12 2012 (r820)
@@ -35,8 +35,6 @@
USE_QT4= # empty
QT_NONSTANDARD= yes
ALL_TARGET= default
-CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
-MAKE_ENV= PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
@@ -114,16 +112,8 @@
@${GREP} -Flr \"/proc ${MOZSRC}/ipc/chromium/src/base | ${XARGS} ${REINPLACE_CMD} \
-e 's|/proc/self/fd|/dev/fd|' \
-e 's|/proc["/]|/compat/linux&|'
- @${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
- -e 's|%%CXXABI%%|${CXXABI}|' \
- ${MOZSRC}/storage/build/Makefile.in \
- ${MOZSRC}/toolkit/library/Makefile.in \
- ${MOZSRC}/db/sqlite3/src/Makefile.in
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
- ${WRKSRC}/mail/app/nsMailApp.cpp \
- ${MOZSRC}/security/manager/ssl/src/Makefile.in \
- ${MOZSRC}/js/src/config/mkdepend/Makefile.in \
- ${MOZSRC}/js/src/config/config.mk
+ ${WRKSRC}/mail/app/nsMailApp.cpp
pre-configure:
(cd ${WRKSRC} && ${AUTOCONF})
Modified: branches/experimental/mail/thunderbird-esr/files/patch-configure.in
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-configure.in Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/mail/thunderbird-esr/files/patch-configure.in Sat Jun 30 22:55:12 2012 (r820)
@@ -46,61 +46,6 @@
DSO_CFLAGS=''
DSO_PIC_CFLAGS='-fPIC'
DSO_LDOPTS='-shared -fPIC'
-@@ -3304,11 +3307,11 @@
- ;;
- *)
- MOZ_CHECK_PTHREADS(pthreads,
-- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads",
-+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthreads",
- MOZ_CHECK_PTHREADS(pthread,
-- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread",
-+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread",
- MOZ_CHECK_PTHREADS(c_r,
-- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r",
-+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread",
- MOZ_CHECK_PTHREADS(c,
- USE_PTHREADS=1
- )
-@@ -3383,18 +3386,18 @@
- *-*-freebsd*)
- AC_DEFINE(_REENTRANT)
- AC_DEFINE(_THREAD_SAFE)
-- dnl -pthread links in -lc_r, so don't specify it explicitly.
-+ dnl -pthread links in -pthread, so don't specify it explicitly.
- if test "$ac_cv_have_dash_pthread" = "yes"; then
- _PTHREAD_LDFLAGS="-pthread"
- else
-- _PTHREAD_LDFLAGS="-lc_r"
-+ _PTHREAD_LDFLAGS="-pthread"
- fi
- ;;
-
- *-*-openbsd*|*-*-bsdi*)
- AC_DEFINE(_REENTRANT)
- AC_DEFINE(_THREAD_SAFE)
-- dnl -pthread links in -lc_r, so don't specify it explicitly.
-+ dnl -pthread links in -pthread, so don't specify it explicitly.
- if test "$ac_cv_have_dash_pthread" = "yes"; then
- _PTHREAD_LDFLAGS="-pthread"
- fi
-@@ -3569,7 +3572,7 @@
- ac_cv_func_iconv,
- [AC_TRY_LINK([
- #include <stdlib.h>
-- #include <iconv.h>
-+ #include "/usr/local/include/iconv.h"
- ],
- [
- iconv_t h = iconv_open("", "");
-@@ -3590,7 +3593,7 @@
- ac_cv_func_const_iconv,
- [AC_TRY_COMPILE([
- #include <stdlib.h>
-- #include <iconv.h>
-+ #include "/usr/local/include/iconv.h"
- ],
- [
- const char *input = "testing";
@@ -4218,6 +4218,9 @@ else
NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
fi
Deleted: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-db-sqlite3-src-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-db-sqlite3-src-Makefile.in Sat Jun 30 22:55:12 2012 (r819)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- mozilla/db/sqlite3/src/Makefile.in.orig 2008-06-19 11:03:17.000000000 -0500
-+++ mozilla/db/sqlite3/src/Makefile.in 2008-06-19 11:04:15.000000000 -0500
-@@ -45,6 +45,8 @@
-
- include $(DEPTH)/config/autoconf.mk
-
-+OS_CFLAGS = -I../../../dist/include/sqlite3
-+OS_LIBS = %%PTHREAD_LIBS%%
- MODULE = sqlite3
- LIBRARY_NAME = sqlite3
- FORCE_SHARED_LIB = 1
Modified: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-js-src-config-mkdepend-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-js-src-config-mkdepend-Makefile.in Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-js-src-config-mkdepend-Makefile.in Sat Jun 30 22:55:12 2012 (r820)
@@ -5,7 +5,7 @@
include $(topsrcdir)/config/rules.mk
-HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
++HOST_CFLAGS += -DINCLUDEDIR=\"$(LOCALBASE)/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
ifdef GNU_CC
_GCCDIR = $(shell $(CC) -print-file-name=include)
Modified: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-js-src-config_config.mk
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-js-src-config_config.mk Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-js-src-config_config.mk Sat Jun 30 22:55:12 2012 (r820)
@@ -4,7 +4,7 @@
-I$(srcdir) \
-I. \
-I$(DIST)/include -I$(DIST)/include/nsprpub \
-+ -I%%LOCALBASE%%/include \
++ -I$(LOCALBASE)/include \
$(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \
$(OS_INCLUDES) \
$(NULL)
Modified: branches/experimental/mail/thunderbird-esr/files/patch-mozilla-toolkit-library-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird-esr/files/patch-mozilla-toolkit-library-Makefile.in Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/mail/thunderbird-esr/files/patch-mozilla-toolkit-library-Makefile.in Sat Jun 30 22:55:12 2012 (r820)
@@ -5,7 +5,7 @@
$(INSTALL) $^ .
-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)
-+EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% %%CXXABI%%
++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo
ifdef MOZ_ENABLE_LIBXUL
include $(srcdir)/libxul-rules.mk
Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/mail/thunderbird/Makefile Sat Jun 30 22:55:12 2012 (r820)
@@ -34,8 +34,6 @@
USE_QT4= # empty
QT_NONSTANDARD= yes
ALL_TARGET= default
-CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
-MAKE_ENV= PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
GNU_CONFIGURE= yes
OBJDIR_BUILD= yes
USE_BZIP2= yes
@@ -114,16 +112,8 @@
@${GREP} -Flr \"/proc ${MOZSRC}/ipc/chromium/src/base | ${XARGS} ${REINPLACE_CMD} \
-e 's|/proc/self/fd|/dev/fd|' \
-e 's|/proc["/]|/compat/linux&|'
- @${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
- -e 's|%%CXXABI%%|${CXXABI}|' \
- ${MOZSRC}/storage/build/Makefile.in \
- ${MOZSRC}/toolkit/library/Makefile.in \
- ${MOZSRC}/db/sqlite3/src/Makefile.in
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
- ${WRKSRC}/mail/app/nsMailApp.cpp \
- ${MOZSRC}/security/manager/ssl/src/Makefile.in \
- ${MOZSRC}/js/src/config/mkdepend/Makefile.in \
- ${MOZSRC}/js/src/config/config.mk
+ ${WRKSRC}/mail/app/nsMailApp.cpp
pre-configure:
(cd ${WRKSRC} && ${AUTOCONF})
Modified: branches/experimental/mail/thunderbird/files/patch-configure.in
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-configure.in Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/mail/thunderbird/files/patch-configure.in Sat Jun 30 22:55:12 2012 (r820)
@@ -46,61 +46,6 @@
DSO_CFLAGS=''
DSO_PIC_CFLAGS='-fPIC'
DSO_LDOPTS='-shared -fPIC'
-@@ -3304,11 +3307,11 @@
- ;;
- *)
- MOZ_CHECK_PTHREADS(pthreads,
-- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads",
-+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthreads",
- MOZ_CHECK_PTHREADS(pthread,
-- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread",
-+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread",
- MOZ_CHECK_PTHREADS(c_r,
-- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r",
-+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread",
- MOZ_CHECK_PTHREADS(c,
- USE_PTHREADS=1
- )
-@@ -3383,18 +3386,18 @@
- *-*-freebsd*)
- AC_DEFINE(_REENTRANT)
- AC_DEFINE(_THREAD_SAFE)
-- dnl -pthread links in -lc_r, so don't specify it explicitly.
-+ dnl -pthread links in -pthread, so don't specify it explicitly.
- if test "$ac_cv_have_dash_pthread" = "yes"; then
- _PTHREAD_LDFLAGS="-pthread"
- else
-- _PTHREAD_LDFLAGS="-lc_r"
-+ _PTHREAD_LDFLAGS="-pthread"
- fi
- ;;
-
- *-*-openbsd*|*-*-bsdi*)
- AC_DEFINE(_REENTRANT)
- AC_DEFINE(_THREAD_SAFE)
-- dnl -pthread links in -lc_r, so don't specify it explicitly.
-+ dnl -pthread links in -pthread, so don't specify it explicitly.
- if test "$ac_cv_have_dash_pthread" = "yes"; then
- _PTHREAD_LDFLAGS="-pthread"
- fi
-@@ -3569,7 +3572,7 @@
- ac_cv_func_iconv,
- [AC_TRY_LINK([
- #include <stdlib.h>
-- #include <iconv.h>
-+ #include "/usr/local/include/iconv.h"
- ],
- [
- iconv_t h = iconv_open("", "");
-@@ -3590,7 +3593,7 @@
- ac_cv_func_const_iconv,
- [AC_TRY_COMPILE([
- #include <stdlib.h>
-- #include <iconv.h>
-+ #include "/usr/local/include/iconv.h"
- ],
- [
- const char *input = "testing";
@@ -4218,6 +4218,9 @@ else
NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
fi
Deleted: branches/experimental/mail/thunderbird/files/patch-mozilla-db-sqlite3-src-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-db-sqlite3-src-Makefile.in Sat Jun 30 22:55:12 2012 (r819)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- mozilla/db/sqlite3/src/Makefile.in.orig 2008-06-19 11:03:17.000000000 -0500
-+++ mozilla/db/sqlite3/src/Makefile.in 2008-06-19 11:04:15.000000000 -0500
-@@ -45,6 +45,8 @@
-
- include $(DEPTH)/config/autoconf.mk
-
-+OS_CFLAGS = -I../../../dist/include/sqlite3
-+OS_LIBS = %%PTHREAD_LIBS%%
- MODULE = sqlite3
- LIBRARY_NAME = sqlite3
- FORCE_SHARED_LIB = 1
Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-config-mkdepend-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-config-mkdepend-Makefile.in Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-config-mkdepend-Makefile.in Sat Jun 30 22:55:12 2012 (r820)
@@ -5,7 +5,7 @@
include $(topsrcdir)/config/rules.mk
-HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
++HOST_CFLAGS += -DINCLUDEDIR=\"$(LOCALBASE)/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
ifdef GNU_CC
_GCCDIR = $(shell $(CC) -print-file-name=include)
Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-config_config.mk
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-config_config.mk Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-js-src-config_config.mk Sat Jun 30 22:55:12 2012 (r820)
@@ -4,7 +4,7 @@
-I$(srcdir) \
-I. \
-I$(DIST)/include -I$(DIST)/include/nsprpub \
-+ -I%%LOCALBASE%%/include \
++ -I$(LOCALBASE)/include \
$(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \
$(OS_INCLUDES) \
$(NULL)
Modified: branches/experimental/mail/thunderbird/files/patch-mozilla-toolkit-library-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird/files/patch-mozilla-toolkit-library-Makefile.in Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/mail/thunderbird/files/patch-mozilla-toolkit-library-Makefile.in Sat Jun 30 22:55:12 2012 (r820)
@@ -5,7 +5,7 @@
$(INSTALL) $^ .
-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)
-+EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% %%CXXABI%%
++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo
ifdef MOZ_ENABLE_LIBXUL
include $(srcdir)/libxul-rules.mk
Modified: branches/experimental/mail/thunderbird3/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird3/Makefile Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/mail/thunderbird3/Makefile Sat Jun 30 22:55:12 2012 (r820)
@@ -28,8 +28,6 @@
MAKE_JOBS_SAFE= yes
WANT_GNOME= yes
ALL_TARGET= default
-CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
-MAKE_ENV= PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
@@ -82,15 +80,6 @@
${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|;s|@MOZILLA@|${MOZILLA}|' \
<${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
-post-patch:
- ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
- ${MOZSRC}/storage/build/Makefile.in \
- ${MOZSRC}/db/sqlite3/src/Makefile.in
- @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
- ${MOZSRC}/security/manager/ssl/src/Makefile.in \
- ${MOZSRC}/js/src/config/mkdepend/Makefile.in \
- ${MOZSRC}/js/src/config/config.mk
-
pre-configure:
(cd ${WRKSRC} && ${AUTOCONF})
(cd ${MOZSRC} && ${AUTOCONF})
Deleted: branches/experimental/mail/thunderbird3/files/patch-mozilla-db-sqlite3-src-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird3/files/patch-mozilla-db-sqlite3-src-Makefile.in Sat Jun 30 22:55:12 2012 (r819)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- mozilla/db/sqlite3/src/Makefile.in.orig 2008-06-19 11:03:17.000000000 -0500
-+++ mozilla/db/sqlite3/src/Makefile.in 2008-06-19 11:04:15.000000000 -0500
-@@ -45,6 +45,8 @@
-
- include $(DEPTH)/config/autoconf.mk
-
-+OS_CFLAGS = -I../../../dist/include/sqlite3
-+OS_LIBS = %%PTHREAD_LIBS%%
- MODULE = sqlite3
- LIBRARY_NAME = sqlite3
- FORCE_SHARED_LIB = 1
Modified: branches/experimental/mail/thunderbird3/files/patch-mozilla-js-src-config-mkdepend-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird3/files/patch-mozilla-js-src-config-mkdepend-Makefile.in Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/mail/thunderbird3/files/patch-mozilla-js-src-config-mkdepend-Makefile.in Sat Jun 30 22:55:12 2012 (r820)
@@ -5,7 +5,7 @@
include $(topsrcdir)/config/rules.mk
-HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
++HOST_CFLAGS += -DINCLUDEDIR=\"$(LOCALBASE)/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
ifdef GNU_CC
_GCCDIR = $(shell $(CC) -print-file-name=include)
Deleted: branches/experimental/mail/thunderbird3/files/patch-mozilla-storage-build-Makefile.in
==============================================================================
--- branches/experimental/mail/thunderbird3/files/patch-mozilla-storage-build-Makefile.in Sat Jun 30 22:55:12 2012 (r819)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- mozilla/storage/build/Makefile.in.orig Tue Feb 21 11:18:56 2006
-+++ mozilla/storage/build/Makefile.in Sun Nov 5 16:16:06 2006
-@@ -77,6 +77,7 @@
- $(EXTRA_DSO_LIBS) \
- $(MOZ_COMPONENT_LIBS) \
- $(MOZ_JS_LIBS) \
-+ %%PTHREAD_LIBS%% \
- $(NULL)
-
- include $(topsrcdir)/config/rules.mk
Modified: branches/experimental/www/firefox-esr/Makefile
==============================================================================
--- branches/experimental/www/firefox-esr/Makefile Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/firefox-esr/Makefile Sat Jun 30 22:55:12 2012 (r820)
@@ -38,7 +38,6 @@
USE_QT4= # empty
QT_NONSTANDARD= yes
ALL_TARGET= default
-CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
@@ -123,18 +122,8 @@
@${GREP} -Flr \"/proc ${WRKSRC}/ipc/chromium/src/base | ${XARGS} ${REINPLACE_CMD} \
-e 's|/proc/self/fd|/dev/fd|' \
-e 's|/proc["/]|/compat/linux&|'
- ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
- -e 's|%%CXXABI%%|${CXXABI}|' \
- ${WRKSRC}/storage/build/Makefile.in \
- ${WRKSRC}/toolkit/library/Makefile.in \
- ${WRKSRC}/db/sqlite3/src/Makefile.in
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/browser/app/nsBrowserApp.cpp \
- ${WRKSRC}/security/manager/ssl/src/Makefile.in \
- ${WRKSRC}/js/src/config/mkdepend/Makefile.in \
- ${WRKSRC}/js/src/config/config.mk \
- ${WRKSRC}/config/mkdepend/Makefile.in \
- ${WRKSRC}/config/config.mk \
${WRKSRC}/xpcom/io/nsAppFileLocationProvider.cpp
pre-configure:
Modified: branches/experimental/www/firefox-esr/files/patch-config_config.mk
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-config_config.mk Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/firefox-esr/files/patch-config_config.mk Sat Jun 30 22:55:12 2012 (r820)
@@ -4,7 +4,7 @@
-I$(srcdir) \
-I. \
-I$(DIST)/include -I$(DIST)/include/nsprpub \
-+ -I%%LOCALBASE%%/include \
++ -I$(LOCALBASE)/include \
$(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \
$(OS_INCLUDES) \
$(NULL)
Modified: branches/experimental/www/firefox-esr/files/patch-config_mkdepend_Makefile.in
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-config_mkdepend_Makefile.in Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/firefox-esr/files/patch-config_mkdepend_Makefile.in Sat Jun 30 22:55:12 2012 (r820)
@@ -5,7 +5,7 @@
include $(topsrcdir)/config/rules.mk
-HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I%%LOCALBASE%%/include
++HOST_CFLAGS += -DINCLUDEDIR=\"$(LOCALBASE)/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I$(LOCALBASE)/include
+HOST_CFLAGS += $(XCFLAGS)
ifdef GNU_CC
Deleted: branches/experimental/www/firefox-esr/files/patch-db_sqlite3_src_Makefile.in
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-db_sqlite3_src_Makefile.in Sat Jun 30 22:55:12 2012 (r819)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- db/sqlite3/src/Makefile.in.orig 2009-04-28 11:12:00.829684825 +0000
-+++ db/sqlite3/src/Makefile.in 2009-04-28 11:12:20.628076799 +0000
-@@ -45,6 +45,8 @@
-
- include $(DEPTH)/config/autoconf.mk
-
-+OS_CFLAGS = -I../../../dist/include/sqlite3
-+OS_LIBS = %%PTHREAD_LIBS%% -lc
- MODULE = sqlite3
- LIBRARY_NAME = sqlite3
- FORCE_SHARED_LIB = 1
Modified: branches/experimental/www/firefox-esr/files/patch-js-src-config-mkdepend_Makefile.in
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-js-src-config-mkdepend_Makefile.in Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/firefox-esr/files/patch-js-src-config-mkdepend_Makefile.in Sat Jun 30 22:55:12 2012 (r820)
@@ -5,7 +5,7 @@
include $(topsrcdir)/config/rules.mk
-HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I%%LOCALBASE%%/include
++HOST_CFLAGS += -DINCLUDEDIR=\"$(LOCALBASE)/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I$(LOCALBASE)/include
+HOST_CFLAGS += $(XCFLAGS)
ifdef GNU_CC
Modified: branches/experimental/www/firefox-esr/files/patch-js-src-config_config.mk
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-js-src-config_config.mk Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/firefox-esr/files/patch-js-src-config_config.mk Sat Jun 30 22:55:12 2012 (r820)
@@ -4,7 +4,7 @@
-I$(srcdir) \
-I. \
-I$(DIST)/include -I$(DIST)/include/nsprpub \
-+ -I%%LOCALBASE%%/include \
++ -I$(LOCALBASE)/include \
$(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \
$(OS_INCLUDES) \
$(NULL)
Modified: branches/experimental/www/firefox-esr/files/patch-toolkit_library_Makefile.in
==============================================================================
--- branches/experimental/www/firefox-esr/files/patch-toolkit_library_Makefile.in Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/firefox-esr/files/patch-toolkit_library_Makefile.in Sat Jun 30 22:55:12 2012 (r820)
@@ -5,7 +5,7 @@
$(INSTALL) $^ .
-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)
-+EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% %%CXXABI%%
++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo
ifdef MOZ_ENABLE_LIBXUL
include $(srcdir)/libxul-rules.mk
Modified: branches/experimental/www/firefox-nightly/Makefile
==============================================================================
--- branches/experimental/www/firefox-nightly/Makefile Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/firefox-nightly/Makefile Sat Jun 30 22:55:12 2012 (r820)
@@ -40,7 +40,6 @@
USE_QT4= # empty
QT_NONSTANDARD= yes
ALL_TARGET= default
-CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
@@ -142,18 +141,8 @@
@${GREP} -Flr \"/proc ${WRKSRC}/ipc/chromium/src/base | ${XARGS} ${REINPLACE_CMD} \
-e 's|/proc/self/fd|/dev/fd|' \
-e 's|/proc["/]|/compat/linux&|'
- ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
- -e 's|%%CXXABI%%|${CXXABI}|' \
- ${WRKSRC}/storage/build/Makefile.in \
- ${WRKSRC}/toolkit/library/Makefile.in \
- ${WRKSRC}/db/sqlite3/src/Makefile.in
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/browser/app/nsBrowserApp.cpp \
- ${WRKSRC}/security/manager/ssl/src/Makefile.in \
- ${WRKSRC}/js/src/config/mkdepend/Makefile.in \
- ${WRKSRC}/js/src/config/config.mk \
- ${WRKSRC}/config/mkdepend/Makefile.in \
- ${WRKSRC}/config/config.mk \
${WRKSRC}/xpcom/io/nsAppFileLocationProvider.cpp
pre-configure:
Modified: branches/experimental/www/firefox-nightly/files/patch-config_config.mk
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-config_config.mk Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/firefox-nightly/files/patch-config_config.mk Sat Jun 30 22:55:12 2012 (r820)
@@ -4,7 +4,7 @@
-I$(DIST)/include \
$(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include) \
$(OS_INCLUDES) \
-+ -I%%LOCALBASE%%/include \
++ -I$(LOCALBASE)/include \
$(NULL)
include $(topsrcdir)/config/static-checking-config.mk
Modified: branches/experimental/www/firefox-nightly/files/patch-config_mkdepend_Makefile.in
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-config_mkdepend_Makefile.in Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/firefox-nightly/files/patch-config_mkdepend_Makefile.in Sat Jun 30 22:55:12 2012 (r820)
@@ -5,7 +5,7 @@
include $(topsrcdir)/config/rules.mk
-HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I%%LOCALBASE%%/include
++HOST_CFLAGS += -DINCLUDEDIR=\"$(LOCALBASE)/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I$(LOCALBASE)/include
+HOST_CFLAGS += $(XCFLAGS)
ifdef GNU_CC
Deleted: branches/experimental/www/firefox-nightly/files/patch-db_sqlite3_src_Makefile.in
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-db_sqlite3_src_Makefile.in Sat Jun 30 22:55:12 2012 (r819)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- db/sqlite3/src/Makefile.in.orig 2009-04-28 11:12:00.829684825 +0000
-+++ db/sqlite3/src/Makefile.in 2009-04-28 11:12:20.628076799 +0000
-@@ -45,6 +45,8 @@
-
- include $(DEPTH)/config/autoconf.mk
-
-+OS_CFLAGS = -I../../../dist/include/sqlite3
-+OS_LIBS = %%PTHREAD_LIBS%% -lc
- MODULE = sqlite3
- LIBRARY_NAME = sqlite3
- FORCE_SHARED_LIB = 1
Modified: branches/experimental/www/firefox-nightly/files/patch-js-src-config-mkdepend_Makefile.in
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-js-src-config-mkdepend_Makefile.in Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/firefox-nightly/files/patch-js-src-config-mkdepend_Makefile.in Sat Jun 30 22:55:12 2012 (r820)
@@ -5,7 +5,7 @@
include $(topsrcdir)/config/rules.mk
-HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I%%LOCALBASE%%/include
++HOST_CFLAGS += -DINCLUDEDIR=\"$(LOCALBASE)/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I$(LOCALBASE)/include
+HOST_CFLAGS += $(XCFLAGS)
ifdef GNU_CC
Modified: branches/experimental/www/firefox-nightly/files/patch-js-src-config_config.mk
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-js-src-config_config.mk Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/firefox-nightly/files/patch-js-src-config_config.mk Sat Jun 30 22:55:12 2012 (r820)
@@ -4,7 +4,7 @@
-I$(DIST)/include \
$(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include) \
$(OS_INCLUDES) \
-+ -I%%LOCALBASE%%/include \
++ -I$(LOCALBASE)/include \
$(NULL)
include $(topsrcdir)/config/static-checking-config.mk
Modified: branches/experimental/www/firefox-nightly/files/patch-toolkit_library_Makefile.in
==============================================================================
--- branches/experimental/www/firefox-nightly/files/patch-toolkit_library_Makefile.in Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/firefox-nightly/files/patch-toolkit_library_Makefile.in Sat Jun 30 22:55:12 2012 (r820)
@@ -5,7 +5,7 @@
endif
-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)
-+EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% %%CXXABI%%
++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo
ifndef MOZ_ENABLE_LIBXUL
EXTRA_DSO_LDOPTS += \
Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/firefox/Makefile Sat Jun 30 22:55:12 2012 (r820)
@@ -37,7 +37,6 @@
USE_QT4= # empty
QT_NONSTANDARD= yes
ALL_TARGET= default
-CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
GNU_CONFIGURE= yes
OBJDIR_BUILD= yes
USE_BZIP2= yes
@@ -119,18 +118,8 @@
@${GREP} -Flr \"/proc ${WRKSRC}/ipc/chromium/src/base | ${XARGS} ${REINPLACE_CMD} \
-e 's|/proc/self/fd|/dev/fd|' \
-e 's|/proc["/]|/compat/linux&|'
- ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
- -e 's|%%CXXABI%%|${CXXABI}|' \
- ${WRKSRC}/storage/build/Makefile.in \
- ${WRKSRC}/toolkit/library/Makefile.in \
- ${WRKSRC}/db/sqlite3/src/Makefile.in
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/browser/app/nsBrowserApp.cpp \
- ${WRKSRC}/security/manager/ssl/src/Makefile.in \
- ${WRKSRC}/js/src/config/mkdepend/Makefile.in \
- ${WRKSRC}/js/src/config/config.mk \
- ${WRKSRC}/config/mkdepend/Makefile.in \
- ${WRKSRC}/config/config.mk \
${WRKSRC}/xpcom/io/nsAppFileLocationProvider.cpp
pre-configure:
Modified: branches/experimental/www/firefox/files/patch-config_config.mk
==============================================================================
--- branches/experimental/www/firefox/files/patch-config_config.mk Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/firefox/files/patch-config_config.mk Sat Jun 30 22:55:12 2012 (r820)
@@ -4,7 +4,7 @@
-I$(srcdir) \
-I. \
-I$(DIST)/include -I$(DIST)/include/nsprpub \
-+ -I%%LOCALBASE%%/include \
++ -I$(LOCALBASE)/include \
$(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \
$(OS_INCLUDES) \
$(NULL)
Modified: branches/experimental/www/firefox/files/patch-config_mkdepend_Makefile.in
==============================================================================
--- branches/experimental/www/firefox/files/patch-config_mkdepend_Makefile.in Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/firefox/files/patch-config_mkdepend_Makefile.in Sat Jun 30 22:55:12 2012 (r820)
@@ -5,7 +5,7 @@
include $(topsrcdir)/config/rules.mk
-HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I%%LOCALBASE%%/include
++HOST_CFLAGS += -DINCLUDEDIR=\"$(LOCALBASE)/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I$(LOCALBASE)/include
+HOST_CFLAGS += $(XCFLAGS)
ifdef GNU_CC
Deleted: branches/experimental/www/firefox/files/patch-db_sqlite3_src_Makefile.in
==============================================================================
--- branches/experimental/www/firefox/files/patch-db_sqlite3_src_Makefile.in Sat Jun 30 22:55:12 2012 (r819)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- db/sqlite3/src/Makefile.in.orig 2009-04-28 11:12:00.829684825 +0000
-+++ db/sqlite3/src/Makefile.in 2009-04-28 11:12:20.628076799 +0000
-@@ -45,6 +45,8 @@
-
- include $(DEPTH)/config/autoconf.mk
-
-+OS_CFLAGS = -I../../../dist/include/sqlite3
-+OS_LIBS = %%PTHREAD_LIBS%% -lc
- MODULE = sqlite3
- LIBRARY_NAME = sqlite3
- FORCE_SHARED_LIB = 1
Modified: branches/experimental/www/firefox/files/patch-js-src-config-mkdepend_Makefile.in
==============================================================================
--- branches/experimental/www/firefox/files/patch-js-src-config-mkdepend_Makefile.in Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/firefox/files/patch-js-src-config-mkdepend_Makefile.in Sat Jun 30 22:55:12 2012 (r820)
@@ -5,7 +5,7 @@
include $(topsrcdir)/config/rules.mk
-HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I%%LOCALBASE%%/include
++HOST_CFLAGS += -DINCLUDEDIR=\"$(LOCALBASE)/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I$(LOCALBASE)/include
+HOST_CFLAGS += $(XCFLAGS)
ifdef GNU_CC
Modified: branches/experimental/www/firefox/files/patch-js-src-config_config.mk
==============================================================================
--- branches/experimental/www/firefox/files/patch-js-src-config_config.mk Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/firefox/files/patch-js-src-config_config.mk Sat Jun 30 22:55:12 2012 (r820)
@@ -4,7 +4,7 @@
-I$(srcdir) \
-I. \
-I$(DIST)/include -I$(DIST)/include/nsprpub \
-+ -I%%LOCALBASE%%/include \
++ -I$(LOCALBASE)/include \
$(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \
$(OS_INCLUDES) \
$(NULL)
Modified: branches/experimental/www/firefox/files/patch-toolkit_library_Makefile.in
==============================================================================
--- branches/experimental/www/firefox/files/patch-toolkit_library_Makefile.in Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/firefox/files/patch-toolkit_library_Makefile.in Sat Jun 30 22:55:12 2012 (r820)
@@ -5,7 +5,7 @@
$(INSTALL) $^ .
-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)
-+EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% %%CXXABI%%
++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo
ifdef MOZ_ENABLE_LIBXUL
include $(srcdir)/libxul-rules.mk
Modified: branches/experimental/www/firefox36/Makefile
==============================================================================
--- branches/experimental/www/firefox36/Makefile Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/firefox36/Makefile Sat Jun 30 22:55:12 2012 (r820)
@@ -34,7 +34,6 @@
MAKE_JOBS_SAFE= yes
WANT_GNOME= yes
ALL_TARGET= default
-CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_GMAKE= yes
@@ -80,15 +79,6 @@
-e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \
<${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop
-post-patch:
- ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
- ${WRKSRC}/storage/build/Makefile.in \
- ${WRKSRC}/db/sqlite3/src/Makefile.in
- @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
- ${WRKSRC}/security/manager/ssl/src/Makefile.in \
- ${WRKSRC}/js/src/config/mkdepend/Makefile.in \
- ${WRKSRC}/js/src/config/config.mk
-
pre-configure:
(cd ${WRKSRC} && ${AUTOCONF})
(cd ${WRKSRC}/js/src/ && ${AUTOCONF})
Deleted: branches/experimental/www/firefox36/files/patch-db_sqlite3_src_Makefile.in
==============================================================================
--- branches/experimental/www/firefox36/files/patch-db_sqlite3_src_Makefile.in Sat Jun 30 22:55:12 2012 (r819)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- db/sqlite3/src/Makefile.in.orig 2009-04-28 11:12:00.829684825 +0000
-+++ db/sqlite3/src/Makefile.in 2009-04-28 11:12:20.628076799 +0000
-@@ -45,6 +45,8 @@
-
- include $(DEPTH)/config/autoconf.mk
-
-+OS_CFLAGS = -I../../../dist/include/sqlite3
-+OS_LIBS = %%PTHREAD_LIBS%% -lc
- MODULE = sqlite3
- LIBRARY_NAME = sqlite3
- FORCE_SHARED_LIB = 1
Modified: branches/experimental/www/firefox36/files/patch-js-src-config-mkdepend_Makefile.in
==============================================================================
--- branches/experimental/www/firefox36/files/patch-js-src-config-mkdepend_Makefile.in Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/firefox36/files/patch-js-src-config-mkdepend_Makefile.in Sat Jun 30 22:55:12 2012 (r820)
@@ -5,7 +5,7 @@
include $(topsrcdir)/config/rules.mk
-HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
++HOST_CFLAGS += -DINCLUDEDIR=\"$(LOCALBASE)/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
ifdef GNU_CC
_GCCDIR = $(shell $(CC) -print-file-name=include)
Modified: branches/experimental/www/firefox36/files/patch-js-src-config_config.mk
==============================================================================
--- branches/experimental/www/firefox36/files/patch-js-src-config_config.mk Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/firefox36/files/patch-js-src-config_config.mk Sat Jun 30 22:55:12 2012 (r820)
@@ -4,7 +4,7 @@
-I$(srcdir) \
-I. \
-I$(DIST)/include -I$(DIST)/include/nsprpub \
-+ -I%%LOCALBASE%%/include \
++ -I$(LOCALBASE)/include \
$(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \
$(OS_INCLUDES) \
$(NULL)
Deleted: branches/experimental/www/firefox36/files/patch-storage_build_Makefile.in
==============================================================================
--- branches/experimental/www/firefox36/files/patch-storage_build_Makefile.in Sat Jun 30 22:55:12 2012 (r819)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- storage/build/Makefile.in.orig Tue Feb 21 11:18:56 2006
-+++ storage/build/Makefile.in Sun Nov 5 16:16:06 2006
-@@ -77,6 +77,7 @@
- $(EXTRA_DSO_LIBS) \
- $(MOZ_COMPONENT_LIBS) \
- $(MOZ_JS_LIBS) \
-+ %%PTHREAD_LIBS%% \
- $(NULL)
-
- include $(topsrcdir)/config/rules.mk
Modified: branches/experimental/www/kompozer/Makefile
==============================================================================
--- branches/experimental/www/kompozer/Makefile Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/kompozer/Makefile Sat Jun 30 22:55:12 2012 (r820)
@@ -45,8 +45,6 @@
.include <bsd.port.pre.mk>
post-patch:
- ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
- ${WRKSRC}/storage/build/Makefile.in
@${RM} -f ${WRKSRC}/config.status ${WRKSRC}/config.cache
@${ECHO_CMD} "LDFLAGS += -L${LOCALBASE}/lib" >> ${WRKSRC}/toolkit/components/Makefile.in
@${ECHO_CMD} "LDFLAGS += -L${LOCALBASE}/lib" >> ${WRKSRC}/toolkit/components/gnome/Makefile.in
Deleted: branches/experimental/www/kompozer/files/patch-storage_build_Makefile.in
==============================================================================
--- branches/experimental/www/kompozer/files/patch-storage_build_Makefile.in Sat Jun 30 22:55:12 2012 (r819)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- storage/build/Makefile.in.orig Tue Feb 21 11:18:56 2006
-+++ storage/build/Makefile.in Sun Nov 5 16:16:06 2006
-@@ -77,6 +77,7 @@
- $(EXTRA_DSO_LIBS) \
- $(MOZ_COMPONENT_LIBS) \
- $(MOZ_JS_LIBS) \
-+ %%PTHREAD_LIBS%% \
- $(NULL)
-
- include $(topsrcdir)/config/rules.mk
Modified: branches/experimental/www/libxul/Makefile
==============================================================================
--- branches/experimental/www/libxul/Makefile Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/libxul/Makefile Sat Jun 30 22:55:12 2012 (r820)
@@ -84,15 +84,8 @@
@${GREP} -Flr \"/proc ${WRKSRC}/ipc/chromium/src/base | ${XARGS} ${REINPLACE_CMD} \
-e 's|/proc/self/fd|/dev/fd|' \
-e 's|/proc["/]|/compat/linux&|'
- @${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
- -e 's|%%CXXABI%%|${CXXABI}|' \
- ${WRKSRC}/storage/build/Makefile.in \
- ${WRKSRC}/toolkit/library/Makefile.in \
- ${WRKSRC}/db/sqlite3/src/Makefile.in
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
- ${WRKSRC}/xulrunner/stub/nsXULStub.cpp \
- ${WRKSRC}/js/src/config/mkdepend/Makefile.in \
- ${WRKSRC}/js/src/config/config.mk
+ ${WRKSRC}/xulrunner/stub/nsXULStub.cpp
pre-configure:
(cd ${WRKSRC} && ${AUTOCONF})
Deleted: branches/experimental/www/libxul/files/patch-db_sqlite3_src_Makefile.in
==============================================================================
--- branches/experimental/www/libxul/files/patch-db_sqlite3_src_Makefile.in Sat Jun 30 22:55:12 2012 (r819)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- db/sqlite3/src/Makefile.in.orig 2009-04-28 11:12:00.829684825 +0000
-+++ db/sqlite3/src/Makefile.in 2009-04-28 11:12:20.628076799 +0000
-@@ -45,6 +45,8 @@
-
- include $(DEPTH)/config/autoconf.mk
-
-+OS_CFLAGS = -I../../../dist/include/sqlite3
-+OS_LIBS = %%PTHREAD_LIBS%% -lc
- MODULE = sqlite3
- LIBRARY_NAME = sqlite3
- FORCE_SHARED_LIB = 1
Modified: branches/experimental/www/libxul/files/patch-js-src-config-mkdepend-Makefile.in
==============================================================================
--- branches/experimental/www/libxul/files/patch-js-src-config-mkdepend-Makefile.in Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/libxul/files/patch-js-src-config-mkdepend-Makefile.in Sat Jun 30 22:55:12 2012 (r820)
@@ -5,7 +5,7 @@
include $(topsrcdir)/config/rules.mk
-HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
++HOST_CFLAGS += -DINCLUDEDIR=\"$(LOCALBASE)/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
ifdef GNU_CC
_GCCDIR = $(shell $(CC) -print-file-name=include)
Modified: branches/experimental/www/libxul/files/patch-js-src-config_config.mk
==============================================================================
--- branches/experimental/www/libxul/files/patch-js-src-config_config.mk Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/libxul/files/patch-js-src-config_config.mk Sat Jun 30 22:55:12 2012 (r820)
@@ -4,7 +4,7 @@
-I$(srcdir) \
-I. \
-I$(DIST)/include -I$(DIST)/include/nsprpub \
-+ -I%%LOCALBASE%%/include \
++ -I$(LOCALBASE)/include \
$(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \
$(OS_INCLUDES) \
$(NULL)
Modified: branches/experimental/www/libxul/files/patch-toolkit_library_Makefile.in
==============================================================================
--- branches/experimental/www/libxul/files/patch-toolkit_library_Makefile.in Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/libxul/files/patch-toolkit_library_Makefile.in Sat Jun 30 22:55:12 2012 (r820)
@@ -5,7 +5,7 @@
$(INSTALL) $^ .
-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)
-+EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% %%CXXABI%%
++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo
ifdef MOZ_ENABLE_LIBXUL
include $(srcdir)/libxul-rules.mk
Modified: branches/experimental/www/libxul19/Makefile
==============================================================================
--- branches/experimental/www/libxul19/Makefile Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/libxul19/Makefile Sat Jun 30 22:55:12 2012 (r820)
@@ -84,9 +84,6 @@
.endif
post-patch:
- ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
- ${WRKSRC}/storage/build/Makefile.in \
- ${WRKSRC}/db/sqlite3/src/Makefile.in
${REINPLACE_CMD} -e 's|/usr/local/include|${LOCALBASE}/include|' \
${WRKSRC}/js/src/config/mkdepend/Makefile.in
Modified: branches/experimental/www/libxul19/files/patch-configure.in
==============================================================================
--- branches/experimental/www/libxul19/files/patch-configure.in Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/libxul19/files/patch-configure.in Sat Jun 30 22:55:12 2012 (r820)
@@ -9,17 +9,6 @@
CPU_ARCH="$OS_TEST"
;;
-@@ -3582,8 +3582,8 @@
- *)
-
- AC_CHECK_LIB(c, iconv, [_ICONV_LIBS="$_ICONV_LIBS"],
-- AC_CHECK_LIB(iconv, iconv, [_ICONV_LIBS="$_ICONV_LIBS -liconv"],
-- AC_CHECK_LIB(iconv, libiconv, [_ICONV_LIBS="$_ICONV_LIBS -liconv"])))
-+ AC_CHECK_LIB(iconv, iconv, [_ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"],
-+ AC_CHECK_LIB(iconv, libiconv, [_ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"])))
- _SAVE_LIBS=$LIBS
- LIBS="$LIBS $_ICONV_LIBS"
- AC_CACHE_CHECK(
@@ -4252,6 +4252,9 @@ else
NSPR_LIBS='`$(LIBXUL_DIST)/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
fi
Deleted: branches/experimental/www/libxul19/files/patch-db_sqlite3_src_Makefile.in
==============================================================================
--- branches/experimental/www/libxul19/files/patch-db_sqlite3_src_Makefile.in Sat Jun 30 22:55:12 2012 (r819)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- db/sqlite3/src/Makefile.in.orig 2008-06-19 11:03:17.000000000 -0500
-+++ db/sqlite3/src/Makefile.in 2008-06-19 11:04:15.000000000 -0500
-@@ -45,6 +45,8 @@
-
- include $(DEPTH)/config/autoconf.mk
-
-+OS_CFLAGS = -I../../../dist/include/sqlite3
-+OS_LIBS = %%PTHREAD_LIBS%%
- MODULE = sqlite3
- LIBRARY_NAME = sqlite3
- FORCE_SHARED_LIB = 1
Modified: branches/experimental/www/libxul19/files/patch-js-src-config-mkdepend-Makefile.in
==============================================================================
--- branches/experimental/www/libxul19/files/patch-js-src-config-mkdepend-Makefile.in Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/libxul19/files/patch-js-src-config-mkdepend-Makefile.in Sat Jun 30 22:55:12 2012 (r820)
@@ -5,7 +5,7 @@
include $(topsrcdir)/config/rules.mk
-HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
++HOST_CFLAGS += -DINCLUDEDIR=\"$(LOCALBASE)/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
ifdef GNU_CC
_GCCDIR = $(shell $(CC) -print-file-name=include)
Deleted: branches/experimental/www/libxul19/files/patch-storage_build_Makefile.in
==============================================================================
--- branches/experimental/www/libxul19/files/patch-storage_build_Makefile.in Sat Jun 30 22:55:12 2012 (r819)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- storage/build/Makefile.in.orig Tue Feb 21 11:18:56 2006
-+++ storage/build/Makefile.in Sun Nov 5 16:16:06 2006
-@@ -77,6 +77,7 @@
- $(EXTRA_DSO_LIBS) \
- $(MOZ_COMPONENT_LIBS) \
- $(MOZ_JS_LIBS) \
-+ %%PTHREAD_LIBS%% \
- $(NULL)
-
- include $(topsrcdir)/config/rules.mk
Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/seamonkey/Makefile Sat Jun 30 22:55:12 2012 (r820)
@@ -38,7 +38,6 @@
MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome
MOZ_EXPORT= LD_LIBRARY_PATH="${WRKSRC}/dist/bin"
-CONFIGURE_ENV= LOCALBASE=${LOCALBASE}
MOZ_EXTENSIONS= default
MOZ_OPTIONS+= --program-transform-name='s/seamonkey/${MOZILLA}/' \
@@ -129,15 +128,7 @@
post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
- ${WRKSRC}/suite/app/nsSuiteApp.cpp \
- ${WRKSRC}/mozilla/security/manager/ssl/src/Makefile.in \
- ${WRKSRC}/mozilla/js/src/config/mkdepend/Makefile.in
- ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
- -e 's|%%CXXABI%%|${CXXABI}|' \
- ${WRKSRC}/suite/build/Makefile.in \
- ${MOZSRC}/storage/build/Makefile.in \
- ${MOZSRC}/toolkit/library/Makefile.in \
- ${MOZSRC}/db/sqlite3/src/Makefile.in
+ ${WRKSRC}/suite/app/nsSuiteApp.cpp
@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \
${WRKSRC}/mozilla/modules/libpref/src/init/all.js
@${REINPLACE_CMD} -e 's|libgnome-2.so.0|libgnome-2.so|' \
Modified: branches/experimental/www/seamonkey/files/patch-configure.in
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-configure.in Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/seamonkey/files/patch-configure.in Sat Jun 30 22:55:12 2012 (r820)
@@ -46,61 +46,6 @@
DSO_CFLAGS=''
DSO_PIC_CFLAGS='-fPIC'
DSO_LDOPTS='-shared -fPIC'
-@@ -3304,11 +3307,11 @@
- ;;
- *)
- MOZ_CHECK_PTHREADS(pthreads,
-- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads",
-+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthreads",
- MOZ_CHECK_PTHREADS(pthread,
-- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthread",
-+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread",
- MOZ_CHECK_PTHREADS(c_r,
-- USE_PTHREADS=1 _PTHREAD_LDFLAGS="-lc_r",
-+ USE_PTHREADS=1 _PTHREAD_LDFLAGS="-pthread",
- MOZ_CHECK_PTHREADS(c,
- USE_PTHREADS=1
- )
-@@ -3383,18 +3386,18 @@
- *-*-freebsd*)
- AC_DEFINE(_REENTRANT)
- AC_DEFINE(_THREAD_SAFE)
-- dnl -pthread links in -lc_r, so don't specify it explicitly.
-+ dnl -pthread links in -pthread, so don't specify it explicitly.
- if test "$ac_cv_have_dash_pthread" = "yes"; then
- _PTHREAD_LDFLAGS="-pthread"
- else
-- _PTHREAD_LDFLAGS="-lc_r"
-+ _PTHREAD_LDFLAGS="-pthread"
- fi
- ;;
-
- *-*-openbsd*|*-*-bsdi*)
- AC_DEFINE(_REENTRANT)
- AC_DEFINE(_THREAD_SAFE)
-- dnl -pthread links in -lc_r, so don't specify it explicitly.
-+ dnl -pthread links in -pthread, so don't specify it explicitly.
- if test "$ac_cv_have_dash_pthread" = "yes"; then
- _PTHREAD_LDFLAGS="-pthread"
- fi
-@@ -3569,7 +3572,7 @@
- ac_cv_func_iconv,
- [AC_TRY_LINK([
- #include <stdlib.h>
-- #include <iconv.h>
-+ #include "/usr/local/include/iconv.h"
- ],
- [
- iconv_t h = iconv_open("", "");
-@@ -3590,7 +3593,7 @@
- ac_cv_func_const_iconv,
- [AC_TRY_COMPILE([
- #include <stdlib.h>
-- #include <iconv.h>
-+ #include "/usr/local/include/iconv.h"
- ],
- [
- const char *input = "testing";
@@ -4218,6 +4218,9 @@ else
NSPR_LIBS='`$(LIBXUL_DIST)/sdk/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`'
fi
Modified: branches/experimental/www/seamonkey/files/patch-mozilla-js-src-config-mkdepend-Makefile.in
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-js-src-config-mkdepend-Makefile.in Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-js-src-config-mkdepend-Makefile.in Sat Jun 30 22:55:12 2012 (r820)
@@ -5,7 +5,7 @@
include $(topsrcdir)/config/rules.mk
-HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
++HOST_CFLAGS += -DINCLUDEDIR=\"$(LOCALBASE)/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
ifdef GNU_CC
_GCCDIR = $(shell $(CC) -print-file-name=include)
Modified: branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in Sat Jun 30 22:54:51 2012 (r819)
+++ branches/experimental/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in Sat Jun 30 22:55:12 2012 (r820)
@@ -5,7 +5,7 @@
endif
-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)
-+EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% %%CXXABI%%
++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo
DEFINES += -DIMPL_XREAPI
Deleted: branches/experimental/www/seamonkey/files/patch-suite-build-Makefile.in
==============================================================================
--- branches/experimental/www/seamonkey/files/patch-suite-build-Makefile.in Sat Jun 30 22:55:12 2012 (r819)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,10 +0,0 @@
---- suite/build/Makefile.in~
-+++ suite/build/Makefile.in
-@@ -76,6 +76,7 @@ SHARED_LIBRARY_LIBS += ../shell/src/$(LI
- endif
-
- EXTRA_DSO_LDOPTS += \
-+ %%CXXABI%% \
- $(LIBS_DIR) \
- $(EXTRA_DSO_LIBS) \
- $(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206302255.q5UMtDYI036382>