Author: beat Date: Sun Dec 5 08:34:52 2010 New Revision: 458 Log: - Sync with ports: Sync to new bsd.autotools.mk Sync CONFLICTS with ports as Firefox 3.7 will not be released
Modified: branches/experimental/www/firefox/Makefile branches/experimental/www/firefox35/Makefile trunk/www/firefox/Makefile trunk/www/firefox35/Makefile Modified: branches/experimental/www/firefox/Makefile ============================================================================== --- branches/experimental/www/firefox/Makefile Sun Dec 5 08:33:23 2010 (r457) +++ branches/experimental/www/firefox/Makefile Sun Dec 5 08:34:52 2010 (r458) @@ -2,7 +2,7 @@ # Date created: 2002/10/21 # Whom: Alan Eldridge <[email protected]> # -# $FreeBSD: ports/www/firefox/Makefile,v 1.224 2010/06/23 18:19:08 beat Exp $ +# $FreeBSD: ports/www/firefox/Makefile,v 1.234 2010/12/04 07:33:55 ade Exp $ # PORTNAME= firefox @@ -19,7 +19,7 @@ BUILD_DEPENDS= nspr>=4.8.6:${PORTSDIR}/devel/nspr -USE_AUTOTOOLS= autoconf:213 +USE_AUTOTOOLS= autoconf213 USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= -png -nss -dbm -jpeg -xft -cairo @@ -40,7 +40,7 @@ USE_GMAKE= yes MAKE_JOBS_SAFE= yes NO_MOZPKGINSTALL=yes -CONFLICTS= firefox-3.[5,7].* +CONFLICTS= firefox-3.[0,5].* FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png Modified: branches/experimental/www/firefox35/Makefile ============================================================================== --- branches/experimental/www/firefox35/Makefile Sun Dec 5 08:33:23 2010 (r457) +++ branches/experimental/www/firefox35/Makefile Sun Dec 5 08:34:52 2010 (r458) @@ -2,7 +2,7 @@ # Date created: 2002/10/21 # Whom: Alan Eldridge <[email protected]> # -# $FreeBSD: ports/www/firefox35/Makefile,v 1.192 2010/06/23 18:21:08 beat Exp $ +# $FreeBSD: ports/www/firefox35/Makefile,v 1.199 2010/12/04 07:33:55 ade Exp $ # PORTNAME= firefox @@ -18,7 +18,7 @@ BUILD_DEPENDS= nspr>=4.8.6:${PORTSDIR}/devel/nspr -USE_AUTOTOOLS= autoconf:213:run +USE_AUTOTOOLS= autoconf213:env LATEST_LINK= firefox35 USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty @@ -40,7 +40,7 @@ USE_BZIP2= yes USE_GMAKE= yes NO_MOZPKGINSTALL=yes -CONFLICTS= firefox-3.[6,7].* +CONFLICTS= firefox-3.0.* firefox-3.6* FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png @@ -81,7 +81,6 @@ .endif post-extract:: - @(cd ${WRKSRC} && ${AUTOCONF}) @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \ -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \ <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop @@ -100,6 +99,9 @@ s|/usr/X11R6|${LOCALBASE}|g' \ ${WRKSRC}/js/src/configure +pre-configure: + @(cd ${WRKSRC} && ${AUTOCONF}) + port-pre-install: # ${SED} -e 's|1.9a7|0|' ${WRKSRC}/dist/bin/application.ini ${FAKEDIR}/lib ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLISTF} Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Sun Dec 5 08:33:23 2010 (r457) +++ trunk/www/firefox/Makefile Sun Dec 5 08:34:52 2010 (r458) @@ -2,7 +2,7 @@ # Date created: 2002/10/21 # Whom: Alan Eldridge <[email protected]> # -# $FreeBSD: ports/www/firefox/Makefile,v 1.224 2010/06/23 18:19:08 beat Exp $ +# $FreeBSD: ports/www/firefox/Makefile,v 1.234 2010/12/04 07:33:55 ade Exp $ # PORTNAME= firefox @@ -19,7 +19,7 @@ BUILD_DEPENDS= nspr>=4.8.6:${PORTSDIR}/devel/nspr -USE_AUTOTOOLS= autoconf:213 +USE_AUTOTOOLS= autoconf213 USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= -png -nss -dbm -jpeg -xft -cairo @@ -40,7 +40,7 @@ USE_GMAKE= yes MAKE_JOBS_SAFE= yes NO_MOZPKGINSTALL=yes -CONFLICTS= firefox-3.[5,7].* +CONFLICTS= firefox-3.[0,5].* FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png Modified: trunk/www/firefox35/Makefile ============================================================================== --- trunk/www/firefox35/Makefile Sun Dec 5 08:33:23 2010 (r457) +++ trunk/www/firefox35/Makefile Sun Dec 5 08:34:52 2010 (r458) @@ -2,7 +2,7 @@ # Date created: 2002/10/21 # Whom: Alan Eldridge <[email protected]> # -# $FreeBSD: ports/www/firefox35/Makefile,v 1.192 2010/06/23 18:21:08 beat Exp $ +# $FreeBSD: ports/www/firefox35/Makefile,v 1.199 2010/12/04 07:33:55 ade Exp $ # PORTNAME= firefox @@ -18,7 +18,7 @@ BUILD_DEPENDS= nspr>=4.8.6:${PORTSDIR}/devel/nspr -USE_AUTOTOOLS= autoconf:213:run +USE_AUTOTOOLS= autoconf213:env LATEST_LINK= firefox35 USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty @@ -40,7 +40,7 @@ USE_BZIP2= yes USE_GMAKE= yes NO_MOZPKGINSTALL=yes -CONFLICTS= firefox-3.[6,7].* +CONFLICTS= firefox-3.0.* firefox-3.6* FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png @@ -81,7 +81,6 @@ .endif post-extract:: - @(cd ${WRKSRC} && ${AUTOCONF}) @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \ -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \ <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop @@ -100,6 +99,9 @@ s|/usr/X11R6|${LOCALBASE}|g' \ ${WRKSRC}/js/src/configure +pre-configure: + @(cd ${WRKSRC} && ${AUTOCONF}) + port-pre-install: # ${SED} -e 's|1.9a7|0|' ${WRKSRC}/dist/bin/application.ini ${FAKEDIR}/lib ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLISTF} _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-gecko To unsubscribe, send any mail to "[email protected]"
