ports/144044: [PATCH] www/firefox: Makefile.webplugins target
order bug
Dmitry Marakasov
amdmi3 at amdmi3.ru
Mon Mar 22 19:00:14 UTC 2010
The following reply was made to PR ports/144044; it has been noted by GNATS.
From: Dmitry Marakasov <amdmi3 at amdmi3.ru>
To: Beat Gaetzi <beat at FreeBSD.org>
Cc: bug-followup at FreeBSD.org
Subject: Re: ports/144044: [PATCH] www/firefox: Makefile.webplugins target
order bug
Date: Mon, 22 Mar 2010 21:52:02 +0300
--cWoXeonUoKmBZSoM
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
* Beat Gaetzi (beat at FreeBSD.org) wrote:
> Thanks for tracking down this issue. I've previously never seen such a
> problem with a webplugin.
> IIRC post-install target is designed to run after any installation task.
No, post-install is installation task itself and is designed to make it
possible to perform more installation tasks in addition to standart ones
without code duplication.
> So I think running webplugins-post-install on post-install is correct.
Yes, but in our case it's running before post-install. If essential
files needed for webplugins-post-install are installed on post-install,
everything breaks - and this is our case.
> Or in which target do you think is the right place to call
> webplugins-post-install?
I think the correct way is to append your tasks to post-install:,
so they are run after tasks defined in the port. I think it's
possible by adding targets to post-install in bsd.port.post.mk, and
I think that bsd.xorg.mk does exactly that, though I'm not sure if
it really respects order, as it doesn't really need to.
For Makefile.webplugins, I think it may be done as following:
- Makefile.webplugins should be modified as attached
- Ports that use it should be checked for that they define
USE_WEBPLUGINS before including Makefile.webplugins
- gnash ports should be changed to include Makefile.webplugins after
post-patch (but USE_WEBPLUGINS is still set unconditionally)
This way, the correct bahaviour should be achieved with minimal
changes. Would be even better to move .include Makefile.webplugins to
the end of Makefile in all ports to use it, to avoid copypaste
problems in future.
The best thing, however, would be to move Makefile.webplugins to
Mk/ as bsd.webplugins.mk and integrate it into bsd.port.mk properly with
respect to port/pre.mk. I think it pretty much deserves a place under
Mk/.
--
Dmitry Marakasov . 55B5 0596 FF1E 8D84 5F56 9510 D35A 80DD F9D2 F77D
amdmi3 at amdmi3.ru ..: jabber: amdmi3 at jabber.ru http://www.amdmi3.ru
--cWoXeonUoKmBZSoM
Content-Type: text/x-diff; charset=utf-8
Content-Disposition: attachment; filename="webplugins.patch"
Index: Makefile.webplugins
===================================================================
RCS file: /home/amdmi3/projects/freebsd/FreeBSD.cvs/ports/www/firefox/Makefile.webplugins,v
retrieving revision 1.1
diff -u -r1.1 Makefile.webplugins
--- Makefile.webplugins 10 Jan 2009 02:45:41 -0000 1.1
+++ Makefile.webplugins 22 Mar 2010 18:04:40 -0000
@@ -137,6 +137,7 @@
# /usr/local/lib/browser_plugins/symlinks/gecko19/fooplugin.xpi -> /usr/local/lib/application/fooplugin.xpi
# ------------------------------------------------------
+.if defined(USE_WEBPLUGINS)
WEBPLUGINS_NAME?= ${PKGBASE}
WEBPLUGINS_FILES?= empty
WEBPLUGINS_APPS_ALL_LINUX= linux-firefox linux-firefox-devel linux-flock \
@@ -190,7 +191,7 @@
_WLF= ${WEBPLUGINS_LINKFARMS:S,${PREFIX},%D,}
_WSD= ${WEBPLUGINS_SLDIR:S,^${PREFIX},%D,}
-webplugins-post-install:
+post-install:
@if [ ! -d ${WEBPLUGINS_DIR} ]; then \
${ECHO_CMD}; \
${ECHO_CMD} "ERROR: The \"${WEBPLUGINS_DIR}\" in WEBPLUGINS_DIR is either a typo or no longer exists. Please make a bug report to ${MAINTAINER} (maintainer)."; \
@@ -223,4 +224,4 @@
@${ECHO_CMD} "@unexec rmdir ${_WSD} ${_Q}" >> ${TMPPLIST}
@${ECHO_CMD} "@unexec rmdir ${_WLD} ${_Q}" >> ${TMPPLIST}
-post-install: webplugins-post-install
+.endif
--cWoXeonUoKmBZSoM--
More information about the freebsd-gecko
mailing list