Author: jbeich Date: Fri Aug 23 02:49:40 2013 New Revision: 1329 Log: move replace-gre to shared makefile
Modified: trunk/www/linux-firefox/Makefile trunk/www/linux-seamonkey/Makefile.common Modified: trunk/www/linux-firefox/Makefile ============================================================================== --- trunk/www/linux-firefox/Makefile Fri Aug 23 02:49:33 2013 (r1328) +++ trunk/www/linux-firefox/Makefile Fri Aug 23 02:49:40 2013 (r1329) @@ -10,11 +10,10 @@ MAINTAINER= [email protected] COMMENT= Web browser based on the browser portion of Mozilla -EXTRACT_DEPENDS=${NONEXISTENT}:${.CURDIR}/../linux-seamonkey:extract - CONFLICTS= linux-firefox-24.* linux-firefox-1[07].* USE_LDCONFIG= yes USE_BZIP2= yes +REPLACE_GRE= yes USE_LINUX_APPS= dbusglib dbuslibs alsalib alsa-plugins-oss @@ -23,23 +22,4 @@ .include "${.CURDIR}/../linux-seamonkey/Makefile.common" -# XXX remove after linux_base-c6 and linux-c6-gtk2 become default -# using seamonkey gre for linux_base-f10 compat -post-extract: replace-gre -replace-gre: version-compat-check - @${ECHO_MSG} "===> GRE versions are compatible, replacing with" \ - "$$(${MAKE} -V PKGNAME -C ${.CURDIR}/../linux-seamonkey)" - cd $$(${MAKE} -V WRKSRC -C ${.CURDIR}/../linux-seamonkey); \ - ${CP} lib* dependentlibs.list ${WRKSRC} - -version-compat-check: - @${ECHO_MSG} "===> Checking GRE version is compatible with" \ - "$$(${MAKE} -V PKGNAME -C ${.CURDIR}/../linux-seamonkey)" - @ff_gre_version=$$(${AWK} -F= '/Milestone/ { print $$2 }' ${WRKSRC}/platform.ini); \ - sm_gre_version=$$(${AWK} -F= '/Milestone/ { print $$2 }' $$(${MAKE} -V WRKSRC -C ${.CURDIR}/../linux-seamonkey)/platform.ini); \ - if [ $$ff_gre_version != $$sm_gre_version ]; then \ - ${ECHO_MSG} "===> GRE versions aren't compatible, aborting"; \ - exit 1; \ - fi - .include <bsd.port.mk> Modified: trunk/www/linux-seamonkey/Makefile.common ============================================================================== --- trunk/www/linux-seamonkey/Makefile.common Fri Aug 23 02:49:33 2013 (r1328) +++ trunk/www/linux-seamonkey/Makefile.common Fri Aug 23 02:49:40 2013 (r1329) @@ -9,6 +9,10 @@ MASTER_SITES?= MOZILLA/${PORTNAME}/releases/${PORTVERSION}esr/linux-i686/en-US PKGNAMEPREFIX?= linux- +.if defined(REPLACE_GRE) +EXTRACT_DEPENDS+=${NONEXISTENT}:${.CURDIR}/../../www/linux-seamonkey:extract +.endif + NO_BUILD= yes ONLY_FOR_ARCHS= i386 amd64 APP_NAME= ${PKGBASE} @@ -38,6 +42,27 @@ @${MKDIR} ${WRKSRC}/${APP_SUBDIR}extensions .endif +.if defined(REPLACE_GRE) +# XXX remove after linux_base-c6 and linux-c6-gtk2 become default +# using seamonkey gre for linux_base-f10 compat +post-extract: replace-gre +replace-gre: version-compat-check + @${ECHO_MSG} "===> GRE versions are compatible, replacing with" \ + "$$(${MAKE} -V PKGNAME -C ${.CURDIR}/../../www/linux-seamonkey)" + cd $$(${MAKE} -V WRKSRC -C ${.CURDIR}/../../www/linux-seamonkey); \ + ${CP} lib* dependentlibs.list ${WRKSRC} + +version-compat-check: + @${ECHO_MSG} "===> Checking GRE version is compatible with" \ + "$$(${MAKE} -V PKGNAME -C ${.CURDIR}/../../www/linux-seamonkey)" + @ff_gre_version=$$(${AWK} -F= '/Milestone/ { print $$2 }' ${WRKSRC}/platform.ini); \ + sm_gre_version=$$(${AWK} -F= '/Milestone/ { print $$2 }' $$(${MAKE} -V WRKSRC -C ${.CURDIR}/../../www/linux-seamonkey)/platform.ini); \ + if [ $$ff_gre_version != $$sm_gre_version ]; then \ + ${ECHO_MSG} "===> GRE versions aren't compatible, aborting"; \ + exit 1; \ + fi +.endif + .if ${CATEGORIES:Mwww} .if !target(post-patch) post-patch: _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-gecko To unsubscribe, send any mail to "[email protected]"
