* Fix a bug where Firebird would lock up after typing any text. This had to

  do with esound being installed, but not being used (e.g. when not running
  under the GNOME Desktop).  What happens now is sound support is disabled by
  default.  If you wish to enable Type Ahead Find sound support, edit your
  prefs.js file, and add:

  user_pref("accessibility.typeaheadfind.enablesound", true);

* Make portlint happy by not including anything after bsd.port.post.mk
* Clean up the pkg-message a bit to reflect reality with respect to Perl

Thanks to casaveli on BSDForums for finding it was esound causing the lock up
as well as testing the patch mentioned above.

3 files changed, 83 insertions, 79 deletions

diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile
index 08357740e94d..e45a1d84d60c 100644
--- a/www/firefox3-devel/Makefile
+++ b/www/firefox3-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firebird
 PORTVERSION=	0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	firebird/releases/${PORTVERSION}
@@ -21,7 +21,6 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		freetype.9:${PORTSDIR}/print/freetype2 \
-		iconv.3:${PORTSDIR}/converters/libiconv \
 		nspr4.1:${PORTSDIR}/devel/nspr
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 		freetype-config:${PORTSDIR}/print/freetype2
@@ -30,6 +29,7 @@ CONFIGURE_ENV=	WITH_GTK2=yes
 USE_X_PREFIX=	yes
 
 ALL_TARGET=	default
+USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20 libidl
 USE_PERL5=	yes
@@ -108,17 +108,19 @@ post-patch:
 		${WRKSRC}/security/coreconf/FreeBSD.mk \
 		${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
 		${WRKSRC}/js/src/Makefile.in
+	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \
+		${WRKSRC}/modules/libpref/src/init/all.js \
+		${WRKSRC}/browser/app/profile/all.js \
+		${WRKSRC}/calendar/sunbird/app/profile/all.js
 
 pre-install:
 	${RM} -fr ${LOCAL_PREFIX}
 	-${MKDIR} ${PLUGINSDIR}
 
-install-extra:
+post-install:
 .for i in ${EXTRA_SCRIPTS}
 	${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin
 .endfor # i in ${EXTRA_SCRIPTS}
-
-link-bins:
 	${RM} -f ${PREFIX}/bin/firebird
 	${LN} -s ${LOCAL_PREFIX}/bin/MozillaFirebird \
 		${PREFIX}/bin/firebird
@@ -128,14 +130,10 @@ link-bins:
 	${RM} -f ${PREFIX}/bin/firebird-config
 	${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
 		${PREFIX}/bin/firebird-config
-
-link-java:
 	-${RM} -f ${PLUGINSDIR}/libjavaplugin_oji.so
 	-${LN} -sf \
-	  ${JREDIR}/plugin/${ARCH}/ns600/libjavaplugin_oji.so \
-	  ${PLUGINSDIR}/libjavaplugin_oji.so
-
-cleanup-install:
+		${JREDIR}/plugin/${ARCH}/ns600/libjavaplugin_oji.so \
+		${PLUGINSDIR}/libjavaplugin_oji.so
 	${RM} -fr ${LOCAL_PREFIX}/share/idl
 	${RM} -fr ${LOCAL_PREFIX}/include
 
@@ -159,16 +157,4 @@ cons-plist:
 	${FIND} ${LOCAL_SUBDIR} -type d ! -empty | ${SORT} -r \
 		| ${SED} -e "s:^:@dirrm :" >> ${PLIST}
 
-.PHONY: install-extra link-bins link-java cleanup-install cons-plist
-
 .include <bsd.port.post.mk>
-
-# <alane>
-# Under normal circumstances, you should not put anything after
-# the above line. However, this is the only way I can state the
-# dependency without trashing the actual code of the generate-plist
-# target. This is a limitation of the make(1) program itself.
-# </alane>
-generate-plist: install-extra link-bins link-java cleanup-install
-
-#EOF
diff --git a/www/firefox3-devel/files/patch-typeaheadfind-nosound b/www/firefox3-devel/files/patch-typeaheadfind-nosound
new file mode 100644
index 000000000000..9cc1d3506fb0
--- /dev/null
+++ b/www/firefox3-devel/files/patch-typeaheadfind-nosound
@@ -0,0 +1,72 @@
+--- extensions/typeaheadfind/src/nsTypeAheadFind.cpp.orig	Sun Feb  8 01:13:31 2004
++++ extensions/typeaheadfind/src/nsTypeAheadFind.cpp	Sun Feb  8 01:19:17 2004
+@@ -323,11 +323,11 @@
+   prefBranch->GetBoolPref("accessibility.typeaheadfind.startlinksonly",
+                           &mStartLinksOnlyPref);
+ 
+-  PRBool isSoundEnabled = PR_TRUE;
++  mIsSoundEnabled = PR_TRUE;
+   prefBranch->GetBoolPref("accessibility.typeaheadfind.enablesound",
+-                           &isSoundEnabled);
++                           &mIsSoundEnabled);
+   nsXPIDLCString soundStr;
+-  if (isSoundEnabled) {
++  if (mIsSoundEnabled) {
+     prefBranch->GetCharPref("accessibility.typeaheadfind.soundURL",
+                              getter_Copies(soundStr));
+   }
+@@ -612,7 +612,7 @@
+     return NS_OK;
+   }
+ 
+-  if (!mIsSoundInitialized) {
++  if (!mIsSoundInitialized && mIsSoundEnabled) {
+     // This makes sure system sound library is loaded so that
+     // there's no lag before the first sound is played
+     // by waiting for the first keystroke, we still get the startup time benefits.
+@@ -760,11 +760,13 @@
+         // It keeps us from accidentally hitting backspace too many times and
+         // going back in history when we really just wanted to clear 
+         // the find string.
++	if (mIsSoundEnabled) {
+         nsCOMPtr<nsISound> soundInterface =
+           do_CreateInstance("@mozilla.org/sound;1");
+         if (soundInterface) {
+           soundInterface->Beep(); // beep to warn
+         }
++	}
+         mIsBackspaceProtectOn = PR_FALSE;
+       }
+       else {
+@@ -1009,7 +1011,9 @@
+ 
+     // Error sound (don't fire when backspace is pressed, they're 
+     // trying to correct the mistake!)
+-    PlayNotFoundSound();
++    if (mIsSoundEnabled) {
++      PlayNotFoundSound();
++    }
+ 
+     // Remove bad character from buffer, so we can continue typing from
+     // last matched character
+@@ -1056,7 +1060,7 @@
+ void
+ nsTypeAheadFind::PlayNotFoundSound()
+ {
+-  if (mNotFoundSoundURL.IsEmpty())    // no sound
++  if (mNotFoundSoundURL.IsEmpty() || !mIsSoundEnabled)    // no sound
+     return;
+   if (!mSoundInterface) {
+     mSoundInterface = do_CreateInstance("@mozilla.org/sound;1");
+--- extensions/typeaheadfind/src/nsTypeAheadFind.h.orig	Sun Feb  8 01:11:53 2004
++++ extensions/typeaheadfind/src/nsTypeAheadFind.h	Sun Feb  8 01:19:29 2004
+@@ -194,6 +194,9 @@
+ 
+   nsCString mNotFoundSoundURL;
+ 
++  // Move the sound enabled boolean out for all methods to access.
++  PRBool mIsSoundEnabled;
++
+   // PRBool's are used instead of PRPackedBool's where the address of the
+   // boolean variable is getting passed into a method. For example:
+   // GetBoolPref("accessibility.typeaheadfind.linksonly", &mLinksOnlyPref);
diff --git a/www/firefox3-devel/pkg-message b/www/firefox3-devel/pkg-message
index f2c3ca956d4e..165b030e3e5d 100644
--- a/www/firefox3-devel/pkg-message
+++ b/www/firefox3-devel/pkg-message
@@ -1,21 +1,13 @@
 ======================================================================
-Mozilla Firebird will work with either of the port versions of perl, 
-provided you do "use.perl port". It will NOT work with the -STABLE 
-base-system versions of Perl.
-
-If you use the lang/perl5.8 port, please remove the File::Spec package with
-the command "pkg_deinstall -f p5-File-Spec". If you are updating to the 5.8
-version of perl, please do this *first*.
-
 Any bug reports should be addressed to the maintainers at:
 	gnome@FreeBSD.org
 You may also Cc: freebsd-ports@freebsd.org. Please do not send
-bug reports to any other addresses. 
+bug reports to any other addresses.
 
 Please include the following information with any bug report:
 * Output from 'uname -a'.
 * Date/time stamp from www/mozilla-firebird/Makefile.
-* Perl version used (/usr/bin/perl --version or 
+* Perl version used (/usr/bin/perl --version or
 	/usr/local/bin/perl --version for -current).
 * Where/when did the problem occur: configuring, building, or
 	running mozilla-firebird?
@@ -24,50 +16,4 @@ Please include the following information with any bug report:
 Thank you for your help in testing and reporting bugs, and we hope you
 enjoy using Firebird.
 The Maintainers (gnome@)
-
-Additional notes:
-
-0.6:
-Update to 0.6 version, rename from phoenix to Mozilla Firebird, all
-internal names updated accordingly.
-
-0.4_8:
-Add patch to fix network ops on -CURRENT.
-
-0.4_9:
-Install link to java plugin.
-Build plist after install using find/sed.
-
-0.4_10:
-Backdown after failed 0.5 from nonofficial tree. Makefile modifications
-to generate plist done right this time.
-
-0.5_1
-Official 0.5 release port.
-
-****WARNING! DANGER, WILL ROBINSON!**** You must delete your old .phoenix
-dir! Save your bookmarks.html somewhere and then let it create a new
-directory. You can import your old bookmark file. Bug reports from people
-who did not do this are going to be taken at extremely low priority.
-
-Also, please see the nifty new phoenix themes and extensions at the new
-website http://texturizer.net/phoenix/index.html.
-
-Finally make portlint STFU about the Makefile.
-
-The distfile is on my distfiles dir this time, so I have mirrored it on my
-html page until the distfiles dir gets mirrored in 24-48 hours.
-
-I had to disable Xinerama since it was breaking the build.
-
-0.5_4
-Patch to hopefully fix crash when formatting time string at end of download.
-Thanks to Greg Rumple and Joe Marcus Clarke for the fantastic work debugging
-this one.
-
-Added /usr/X11R6/bin/firebird.rb. If you have ruby installed, you can run
-this instead of 'firebird' and it takes care of the 'profile in use' errors
-by automatically using an existing phoenix if one is running. I didn't put
-a dependency because I don't want to require ruby + ruby-shim to run the
-browser.
 ======================================================================