www/firefox [ 9.1-RELEASE ] fails: 1 out of 1 hunks failed--saving rejects to media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h.rej

[Vikash Badal]

root at releng-x64:/usr/ports/www/firefox # make
===>  Found saved configuration for firefox-18.0,1
===>  Extracting for firefox-18.0,1
=> SHA256 Checksum OK for firefox-18.0.source.tar.bz2.
===>   firefox-18.0,1 depends on file: /usr/local/bin/perl5.14.2 - found
===>  Patching for firefox-18.0,1
===>   firefox-18.0,1 depends on file: /usr/local/bin/perl5.14.2 - found
===>   Converting DOS text file to UNIX text file:
===>  Applying extra patch /usr/ports/www/firefox/files/extra-bug780531
===>  Applying FreeBSD patches for firefox-18.0,1
1 out of 1 hunks failed--saving rejects to
media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h.rej
=> Patch patch-bug807492 failed to apply cleanly.
=> Patch(es) patch-alsapulse patch-browser-app-nsBrowserApp.cpp
patch-bug685258 patch-bug722975 patch-bug732340 patch-bug778078
patch-bug781457 patch-bug783463 patch-bug783505 patch-bug787804
patch-bug788955 patch-bug791305 patch-bug798354 patch-bug800401
patch-bug806139 applied cleanly.
*** [do-patch] Error code 1

Stop in /usr/ports/www/firefox.
*** [build] Error code 1

Stop in /usr/ports/www/firefox.



root at releng-x64:/usr/ports/www/firefox # cat
work/mozilla-release/media/mtransport/third_party/nrappkit/src/port/generic/include/sys/queue.h.rej
***************
*** 28,44 ****
   *
   *    @(#)queue.h     8.5 (Berkeley) 8/20/94
   * $FreeBSD: ports/www/firefox/files/patch-bug807492,v 1.2 2013/01/11
07:48:06 svnexp Exp $
   */

  #ifndef _SYS_QUEUE_H_
  #define       _SYS_QUEUE_H_

- #ifndef DARWIN
  #include <stddef.h>
  #define __offsetof offsetof
  #endif

  #define STAILQ_FOREACH_SAFE(var, head, field, tvar)                     \
           for ((var) = STAILQ_FIRST((head));                              \
               (var) && ((tvar) = STAILQ_NEXT((var), field), 1);           \
               (var) = (tvar))
--- 28,44 ----
   *
   *    @(#)queue.h     8.5 (Berkeley) 8/20/94
   * $FreeBSD: ports/www/firefox/files/patch-bug807492,v 1.2 2013/01/11
07:48:06 svnexp Exp $
   */

  #ifndef _SYS_QUEUE_H_
  #define       _SYS_QUEUE_H_

+ #if !defined(BSD) && !defined(DARWIN)
  #include <stddef.h>
  #define __offsetof offsetof
  #endif

  #define STAILQ_FOREACH_SAFE(var, head, field, tvar)                     \
           for ((var) = STAILQ_FIRST((head));                              \
               (var) && ((tvar) = STAILQ_NEXT((var), field), 1);           \
               (var) = (tvar))