Author: jbeich
Date: Thu Aug 9 06:40:34 2012
New Revision: 915
Log:
- look for system includes last[1]
- use LDFLAGS instead of LIBS
PR: ports/159831, ports/160933, ports/170467[1]
Modified:
branches/experimental/Mk/bsd.gecko.mk
branches/experimental/mail/thunderbird-esr/Makefile
branches/experimental/mail/thunderbird/Makefile
branches/experimental/www/firefox-esr/Makefile
branches/experimental/www/firefox-nightly/Makefile
branches/experimental/www/firefox/Makefile
branches/experimental/www/seamonkey/Makefile
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Thu Aug 9 06:40:24 2012
(r914)
+++ branches/experimental/Mk/bsd.gecko.mk Thu Aug 9 06:40:34 2012
(r915)
@@ -544,7 +544,8 @@
MOZ_PKGCONFIG_FILES?= ${MOZILLA}-gtkmozembed ${MOZILLA}-js \
${MOZILLA}-xpcom ${MOZILLA}-plugin
-LIBS+= -L${LOCALBASE}/lib
+CPPFLAGS+= -isystem${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
# Standard depends
_ALL_DEPENDS= cairo dbm event ffi hunspell jpeg nspr nss png sqlite vpx zip
@@ -619,8 +620,6 @@
--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
--with-pthreads
# Configure options for install
-MOZ_OPTIONS+= --x-includes=${LOCALBASE}/include \
- --x-libraries=${LOCALBASE}/lib
.if !defined(MOZ_EXTENSIONS)
MOZ_OPTIONS+= --enable-extensions=default
.else
Modified: branches/experimental/mail/thunderbird-esr/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-esr/Makefile Thu Aug 9 06:40:24
2012 (r914)
+++ branches/experimental/mail/thunderbird-esr/Makefile Thu Aug 9 06:40:34
2012 (r915)
@@ -21,8 +21,6 @@
cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
unzip:${PORTSDIR}/archivers/unzip
-CONFLICTS_BUILD= spidermonkey-*
-
USE_AUTOTOOLS= autoconf213:env
LATEST_LINK= thunderbird-esr
USE_GECKO= gecko
Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile Thu Aug 9 06:40:24
2012 (r914)
+++ branches/experimental/mail/thunderbird/Makefile Thu Aug 9 06:40:34
2012 (r915)
@@ -21,8 +21,6 @@
cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
unzip:${PORTSDIR}/archivers/unzip
-CONFLICTS_BUILD= spidermonkey-*
-
USE_AUTOTOOLS= autoconf213:env
USE_GECKO= gecko
CONFLICTS= thunderbird-10.*
Modified: branches/experimental/www/firefox-esr/Makefile
==============================================================================
--- branches/experimental/www/firefox-esr/Makefile Thu Aug 9 06:40:24
2012 (r914)
+++ branches/experimental/www/firefox-esr/Makefile Thu Aug 9 06:40:34
2012 (r915)
@@ -22,8 +22,6 @@
cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
unzip:${PORTSDIR}/archivers/unzip
-CONFLICTS_BUILD= spidermonkey-*
-
USE_AUTOTOOLS= autoconf213:env
LATEST_LINK= firefox-esr
USE_GECKO= gecko
Modified: branches/experimental/www/firefox-nightly/Makefile
==============================================================================
--- branches/experimental/www/firefox-nightly/Makefile Thu Aug 9 06:40:24
2012 (r914)
+++ branches/experimental/www/firefox-nightly/Makefile Thu Aug 9 06:40:34
2012 (r915)
@@ -24,8 +24,6 @@
cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
unzip:${PORTSDIR}/archivers/unzip
-CONFLICTS_BUILD= spidermonkey-*
-
USE_AUTOTOOLS= autoconf213:env
USE_PYTHON_BUILD=yes
USE_GECKO= gecko
Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile Thu Aug 9 06:40:24 2012
(r914)
+++ branches/experimental/www/firefox/Makefile Thu Aug 9 06:40:34 2012
(r915)
@@ -22,8 +22,6 @@
cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
unzip:${PORTSDIR}/archivers/unzip
-CONFLICTS_BUILD= spidermonkey-*
-
USE_AUTOTOOLS= autoconf213:env
USE_GECKO= gecko
CONFLICTS= firefox-10.*
Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile Thu Aug 9 06:40:24
2012 (r914)
+++ branches/experimental/www/seamonkey/Makefile Thu Aug 9 06:40:34
2012 (r915)
@@ -21,7 +21,6 @@
unzip:${PORTSDIR}/archivers/unzip
USE_AUTOTOOLS= autoconf213:env
-CONFLICTS_BUILD= spidermonkey-1.[0-7]*
USE_BZIP2= yes
USE_GMAKE= yes
USE_GECKO= gecko
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "[email protected]"
