All pastes #172340 Raw Edit

Someone

public text v1 · immutable
·published 2006-09-16 01:02 UTC
rendered paste body
# patch < firefox.patch                                                        
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|probably too late for 4.0, but testing appreciated anyway.
|
|
|Index: Makefile
|===================================================================
|RCS file: /cvs/ports/www/mozilla-firefox/Makefile,v
|retrieving revision 1.54
|diff -u -r1.54 Makefile
|--- Makefile   2006/07/31 09:32:19     1.54
|+++ Makefile   2006/09/15 06:42:36
--------------------------
Patching file Makefile using Plan A...
Hunk #1 succeeded at 4.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: distinfo
|===================================================================
|RCS file: /cvs/ports/www/mozilla-firefox/distinfo,v
|retrieving revision 1.15
|diff -u -r1.15 distinfo
|--- distinfo   2006/07/31 09:32:19     1.15
|+++ distinfo   2006/09/15 06:42:36
--------------------------
Patching file distinfo using Plan A...
Hunk #1 succeeded at 1.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: patches/patch-modules_libpref_src_init_all_js
|===================================================================
|RCS file: /cvs/ports/www/mozilla-firefox/patches/patch-modules_libpref_src_init
_all_js,v
|retrieving revision 1.4
|diff -u -r1.4 patch-modules_libpref_src_init_all_js|===================================================================
|RCS file: /cvs/ports/www/mozilla-firefox/patches/patch-widget_src_gtk2_nsSound_
cpp,v
|retrieving revision 1.2
|diff -u -r1.2 patch-widget_src_gtk2_nsSound_cpp
|--- patches/patch-widget_src_gtk2_nsSound_cpp  2005/12/20 23:44:00     1.2
|+++ patches/patch-widget_src_gtk2_nsSound_cpp  2006/09/15 06:42:36
--------------------------
Patching file patches/patch-widget_src_gtk2_nsSound_cpp using Plan A...
Hunk #1 succeeded at 1.
Hmm...  Ignoring the trailing garbage.
done
# make package
===>  Checking files for mozilla-firefox-1.5.0.7
`/usr/ports/distfiles/firefox-1.5.0.7-source.tar.bz2' is up to date.
>> Checksum OK for firefox-1.5.0.7-source.tar.bz2. (sha1)
===>  mozilla-firefox-1.5.0.7 depends on: libIDL-* - found
===>  mozilla-firefox-1.5.0.7 depends on: zip->=2.3 - found
===>  mozilla-firefox-1.5.0.7 depends on: pkgconfig-* - found
===>  mozilla-firefox-1.5.0.7 depends on: gettext->=0.14.5 - found
===>  mozilla-firefox-1.5.0.7 depends on: metaauto-0.5 - found
===>  mozilla-firefox-1.5.0.7 depends on: autoconf-2.13p0 - found
===>  mozilla-firefox-1.5.0.7 depends on: gmake-3.80p1 - found
===>  mozilla-firefox-1.5.0.7 depends on: bzip2-* - found
===>  mozilla-firefox-1.5.0.7 depends on: gtk+2-* - found
===>  mozilla-firefox-1.5.0.7 depends on: libiconv-* - found
===>  mozilla-firefox-1.5.0.7 depends on: gettext->=0.10.38 - found
===>  Verifying specs: gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 gtk-x11-2.0.0.0 iconv.
>=4 intl.>=3 X11 Xext Xft Xrender Xinerama Xt c fontconfig freetype m  pthread z
  atk-1.0.0.0 cairo glib-2.0.0.0 gmodule-2.0.0.0 gobject-2.0.0.0  jpeg pango-1.0
.0.0 pangocairo-1.0.0.0  pangoft2-1.0.0.0 png stdc++
===>  found gdk-x11-2.0.802.1 gdk_pixbuf-2.0.802.1 gtk-x11-2.0.802.1 iconv.4.0 i
ntl.3.0 X11.9.0 Xext.9.0 Xft.6.0 Xrender.4.1 Xinerama.4.0 Xt.9.0 c.39.3 fontconf
ig.3.0 freetype.13.1 m.2.3 pthread.6.3 z.4.1 atk-1.0.1011.3 cairo.4.4 glib-2.0.1
000.3 gmodule-2.0.1000.3 gobject-2.0.1000.3 jpeg.62.0 pango-1.0.1200.3 pangocair
o-1.0.1200.3 pangoft2-1.0.1200.3 png.5.1 stdc++.42.0
===>  Extracting for mozilla-firefox-1.5.0.7
===>  Patching for mozilla-firefox-1.5.0.7
1 out of 1 hunks failed--saving rejects to browser/app/nsBrowserApp.cpp.rej
***>   patch-browser_app_nsBrowserApp_cpp did not apply cleanly
2 out of 2 hunks failed--saving rejects to directory/c-sdk/ldap/libraries/liblbe
r/lber-int.h.rej
***>   patch-directory_c-sdk_ldap_libraries_liblber_lber-int_h did not apply cle
anly
Ignoring previously applied (or reversed) patch.
4 out of 4 hunks ignored--saving rejects to modules/libpr0n/decoders/png/nsPNGDe
coder.cpp.rej
***>   patch-modules-libpr0n_decoders_png_nsPNGDecoder_cpp did not apply cleanly
===>   Ignoring patchfile patch-modules_libpref_src_init_all_js.orig
Ignoring previously applied (or reversed) patch.
1 out of 1 hunks ignored--saving rejects to nsprpub/pr/include/md/_openbsd.cfg.r
ej
***>   patch-nsprpub_pr_include_md__openbsd_cfg did not apply cleanly
===>   Ignoring patchfile patch-widget_src_gtk2_nsSound_cpp.orig
*** Error code 1

Stop in /usr/ports/www/mozilla-firefox (line 1840 of /usr/ports/infrastructure/m
k/bsd.port.mk).