Author: jbeich
Date: Tue Jun 12 18:43:03 2012
New Revision: 750

Log:
unbreak building out of source tree, e.g.

  CONFIGURE_SCRIPT= ../configure

  MOZ_OBJDIR=       ${WRKSRC}/obj-portbld
  CONFIGURE_WRKSRC= ${MOZ_OBJDIR}
  BUILD_WRKSRC=     ${MOZ_OBJDIR}
  INSTALL_WRKSRC=   ${MOZ_OBJDIR}

  pre-configure:
          ${MKDIR} ${MOZ_OBJDIR}

Modified:
   branches/experimental/Mk/bsd.gecko.mk
   branches/experimental/mail/thunderbird-beta/Makefile
   branches/experimental/mail/thunderbird-esr/Makefile
   branches/experimental/mail/thunderbird/Makefile
   branches/experimental/mail/thunderbird3/Makefile
   branches/experimental/www/firefox-beta/Makefile
   branches/experimental/www/firefox-esr/Makefile
   branches/experimental/www/firefox-nightly/Makefile
   branches/experimental/www/firefox/Makefile
   branches/experimental/www/firefox36/Makefile
   branches/experimental/www/libxul/Makefile
   branches/experimental/www/seamonkey-beta/Makefile
   branches/experimental/www/seamonkey/Makefile

Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk       Mon Jun 11 20:56:15 2012        
(r749)
+++ branches/experimental/Mk/bsd.gecko.mk       Tue Jun 12 18:43:03 2012        
(r750)
@@ -860,7 +860,7 @@
 .if !defined(NOGECKO_PLIST)
        @${RM} -rf ${FAKEDIR} ${PLIST} ${PLISTD} ${PLISTF}
        @${TOUCH} -f ${PLIST} ${PLISTD} ${PLISTF}
-       @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+       @cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
                ${MAKEFILE} ${MAKE_ARGS} prefix=${FAKEDIR} ${INSTALL_TARGET}
 .if defined(MOZILLA_SUFX) && ${MOZILLA_SUFX}!="none"
        ${MV} ${FAKEDIR}/bin/${MOZILLA_EXEC_NAME:S/${MOZILLA_SUFX}//} 
${FAKEDIR}/bin/${MOZILLA}

Modified: branches/experimental/mail/thunderbird-beta/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-beta/Makefile        Mon Jun 11 
20:56:15 2012        (r749)
+++ branches/experimental/mail/thunderbird-beta/Makefile        Tue Jun 12 
18:43:03 2012        (r750)
@@ -22,7 +22,7 @@
 
 CONFLICTS_BUILD=       spidermonkey-*
 
-USE_AUTOTOOLS= autoconf213
+USE_AUTOTOOLS= autoconf213:env
 USE_GECKO=     gecko
 CONFLICTS=     thunderbird-10.*
 USE_MOZILLA=   -nss -dbm -vpx

Modified: branches/experimental/mail/thunderbird-esr/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-esr/Makefile Mon Jun 11 20:56:15 
2012        (r749)
+++ branches/experimental/mail/thunderbird-esr/Makefile Tue Jun 12 18:43:03 
2012        (r750)
@@ -22,7 +22,7 @@
 
 CONFLICTS_BUILD=       spidermonkey-*
 
-USE_AUTOTOOLS= autoconf213
+USE_AUTOTOOLS= autoconf213:env
 LATEST_LINK=   thunderbird-esr
 USE_GECKO=     gecko
 CONFLICTS=     thunderbird-1[1-9].*

Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile     Mon Jun 11 20:56:15 
2012        (r749)
+++ branches/experimental/mail/thunderbird/Makefile     Tue Jun 12 18:43:03 
2012        (r750)
@@ -22,7 +22,7 @@
 
 CONFLICTS_BUILD=       spidermonkey-*
 
-USE_AUTOTOOLS= autoconf213
+USE_AUTOTOOLS= autoconf213:env
 USE_GECKO=     gecko
 CONFLICTS=     thunderbird-10.*
 USE_MOZILLA=   -nss -dbm -vpx

Modified: branches/experimental/mail/thunderbird3/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird3/Makefile    Mon Jun 11 20:56:15 
2012        (r749)
+++ branches/experimental/mail/thunderbird3/Makefile    Tue Jun 12 18:43:03 
2012        (r750)
@@ -18,7 +18,7 @@
 BUILD_DEPENDS= nspr>=4.8:${PORTSDIR}/devel/nspr
 
 DEPRECATED=    will be unsupported by when Thunderbird 12 is release, migrate 
to mail/thunderbird now
-USE_AUTOTOOLS= autoconf213
+USE_AUTOTOOLS= autoconf213:env
 LATEST_LINK=   thunderbird3
 USE_GECKO=     gecko
 USE_MOZILLA=   -nss -dbm -event -ffi -vpx

Modified: branches/experimental/www/firefox-beta/Makefile
==============================================================================
--- branches/experimental/www/firefox-beta/Makefile     Mon Jun 11 20:56:15 
2012        (r749)
+++ branches/experimental/www/firefox-beta/Makefile     Tue Jun 12 18:43:03 
2012        (r750)
@@ -24,7 +24,7 @@
 
 CONFLICTS_BUILD=       spidermonkey-*
 
-USE_AUTOTOOLS= autoconf213
+USE_AUTOTOOLS= autoconf213:env
 USE_GECKO=     gecko
 CONFLICTS=     firefox-10.*
 MOZ_PKGCONFIG_FILES=   # empty

Modified: branches/experimental/www/firefox-esr/Makefile
==============================================================================
--- branches/experimental/www/firefox-esr/Makefile      Mon Jun 11 20:56:15 
2012        (r749)
+++ branches/experimental/www/firefox-esr/Makefile      Tue Jun 12 18:43:03 
2012        (r750)
@@ -24,7 +24,7 @@
 
 CONFLICTS_BUILD=       spidermonkey-*
 
-USE_AUTOTOOLS= autoconf213
+USE_AUTOTOOLS= autoconf213:env
 LATEST_LINK=   firefox-esr
 USE_GECKO=     gecko
 CONFLICTS=     firefox-1[1-9].*

Modified: branches/experimental/www/firefox-nightly/Makefile
==============================================================================
--- branches/experimental/www/firefox-nightly/Makefile  Mon Jun 11 20:56:15 
2012        (r749)
+++ branches/experimental/www/firefox-nightly/Makefile  Tue Jun 12 18:43:03 
2012        (r750)
@@ -27,7 +27,7 @@
 
 CONFLICTS_BUILD=       spidermonkey-*
 
-USE_AUTOTOOLS= autoconf213
+USE_AUTOTOOLS= autoconf213:env
 USE_PYTHON_BUILD=yes
 USE_GECKO=     gecko
 MOZ_PKGCONFIG_FILES=   # empty

Modified: branches/experimental/www/firefox/Makefile
==============================================================================
--- branches/experimental/www/firefox/Makefile  Mon Jun 11 20:56:15 2012        
(r749)
+++ branches/experimental/www/firefox/Makefile  Tue Jun 12 18:43:03 2012        
(r750)
@@ -24,7 +24,7 @@
 
 CONFLICTS_BUILD=       spidermonkey-*
 
-USE_AUTOTOOLS= autoconf213
+USE_AUTOTOOLS= autoconf213:env
 USE_GECKO=     gecko
 CONFLICTS=     firefox-10.*
 MOZ_PKGCONFIG_FILES=   # empty

Modified: branches/experimental/www/firefox36/Makefile
==============================================================================
--- branches/experimental/www/firefox36/Makefile        Mon Jun 11 20:56:15 
2012        (r749)
+++ branches/experimental/www/firefox36/Makefile        Tue Jun 12 18:43:03 
2012        (r750)
@@ -19,7 +19,7 @@
 BUILD_DEPENDS= nspr>=4.8.6:${PORTSDIR}/devel/nspr
 
 DEPRECATED=    will be unsupported by when Firefox 12 is release, migrate to 
www/firefox now
-USE_AUTOTOOLS= autoconf213
+USE_AUTOTOOLS= autoconf213:env
 LATEST_LINK=   firefox36
 USE_GECKO=     gecko
 MOZ_PKGCONFIG_FILES=   # empty

Modified: branches/experimental/www/libxul/Makefile
==============================================================================
--- branches/experimental/www/libxul/Makefile   Mon Jun 11 20:56:15 2012        
(r749)
+++ branches/experimental/www/libxul/Makefile   Tue Jun 12 18:43:03 2012        
(r750)
@@ -23,7 +23,7 @@
 WRKSRC=                ${WRKDIR}/mozilla-release
 CONFLICTS=     mozilla-[0-9]*
 
-USE_AUTOTOOLS= autoconf213
+USE_AUTOTOOLS= autoconf213:env
 WANT_GNOME=    yes
 WANT_PERL=     yes
 ALL_TARGET=    default

Modified: branches/experimental/www/seamonkey-beta/Makefile
==============================================================================
--- branches/experimental/www/seamonkey-beta/Makefile   Mon Jun 11 20:56:15 
2012        (r749)
+++ branches/experimental/www/seamonkey-beta/Makefile   Tue Jun 12 18:43:03 
2012        (r750)
@@ -19,7 +19,7 @@
                unzip:${PORTSDIR}/archivers/unzip
 LIB_DEPENDS=   execinfo.1:${PORTSDIR}/devel/libexecinfo
 
-USE_AUTOTOOLS= autoconf213
+USE_AUTOTOOLS= autoconf213:env
 CONFLICTS_BUILD=       spidermonkey-1.[0-7]*
 USE_BZIP2=     yes
 USE_GMAKE=     yes

Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile        Mon Jun 11 20:56:15 
2012        (r749)
+++ branches/experimental/www/seamonkey/Makefile        Tue Jun 12 18:43:03 
2012        (r750)
@@ -19,7 +19,7 @@
                unzip:${PORTSDIR}/archivers/unzip
 LIB_DEPENDS=   execinfo.1:${PORTSDIR}/devel/libexecinfo
 
-USE_AUTOTOOLS= autoconf213
+USE_AUTOTOOLS= autoconf213:env
 CONFLICTS_BUILD=       spidermonkey-1.[0-7]*
 USE_BZIP2=     yes
 USE_GMAKE=     yes
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "[email protected]"

Reply via email to