Finally, a release Phoenix that works and does not crash all the time.

Approved by:	kris (a long time ago)

55 files changed, 737 insertions, 792 deletions

diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile
index 4737767c1d58..87ad5278d832 100644
--- a/www/firefox-devel/Makefile
+++ b/www/firefox-devel/Makefile
@@ -8,11 +8,11 @@
 #
 
 PORTNAME=		phoenix
-PORTVERSION=		0.4
-PORTREVISION=		10
+PORTVERSION=		0.5
+PORTREVISION=		1
 CATEGORIES=		www # pita
-MASTER_SITES=		${MASTER_SITE_LOCAL} # ${BSD_WEBDIR}
-MASTER_SITE_SUBDIR=	trevor
+MASTER_SITES=		${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
+MASTER_SITE_SUBDIR=	alane
 
 MAINTAINER=		phoenix@freebsd.org # alane@fbsd and trevor@fbsd
 
@@ -39,18 +39,12 @@ HAS_CONFIGURE=		yes
 USE_GNOMENG=		yes
 USE_GNOME=		gtk12 orbit
 
-CPPFLAGS+=		-I${X11BASE}/include
-CFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		-L${X11BASE}/lib
-LIBS+=			${PTHREAD_LIBS}
-
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
 LOCAL_SUBDIR=		lib/${PORTNAME}
 LOCAL_PREFIX=		${PREFIX}/${LOCAL_SUBDIR}
 JREDIR=			${LOCALBASE}/jdk1.3.1/jre
-MOZVER=			1.2b
-#MOZVER=		1.3a
+MOZVER=			1.3a
 PLUGINSDIR=		${LOCAL_PREFIX}/lib/mozilla-${MOZVER}/plugins/
 
 .include <bsd.port.pre.mk>
@@ -65,6 +59,21 @@ BROKEN+="please make sure you have issued the command 'use.perl port'"
 SORT?=/usr/bin/sort
 PLIST=${WRKDIR}/plist
 
+.if defined(WITH_DEBUG)
+WITHOUT_OPTIMIZE=	yes
+CONFIGURE_ENV+=		WITH_DEBUG=yes
+.endif # defined(WITH_DEBUG)
+
+.if !defined(WITHOUT_OPTIMIZE)
+CFLAGS+=		-O2
+.endif # defined(WITH_OPTIMIZE)
+
+
+CPPFLAGS+=		-I${X11BASE}/include
+CFLAGS+=		${PTHREAD_CFLAGS}
+LDFLAGS+=		-L${X11BASE}/lib
+LIBS+=			${PTHREAD_LIBS}
+
 pre-extract::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Extracting source (this takes a while) ..."
@@ -130,6 +139,12 @@ cons-plist:
 
 .include <bsd.port.post.mk>
 
-generate-plist: link-bins link-java cleanup-install cons-plist
+# <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: link-bins cleanup-install cons-plist
 
 #EOF
diff --git a/www/firefox-devel/distinfo b/www/firefox-devel/distinfo
index f61de58d19c1..4199aae89c1e 100644
--- a/www/firefox-devel/distinfo
+++ b/www/firefox-devel/distinfo
@@ -1 +1 @@
-MD5 (phoenix-0.4.tar.bz2) = 4b697330d5fde906b1a6169b80b60102
+MD5 (phoenix-0.5.tar.bz2) = fb99a5a866a99fbb15269699a1022b47
diff --git a/www/firefox-devel/files/mozconfig.in b/www/firefox-devel/files/mozconfig.in
index c6beb3bb3703..2bea08b6719a 100644
--- a/www/firefox-devel/files/mozconfig.in
+++ b/www/firefox-devel/files/mozconfig.in
@@ -38,7 +38,6 @@ ac_add_options --with-pthreads
 ac_add_options --enable-xft
 ac_add_options --enable-reorder
 ac_add_options --enable-strip
-#ac_add_options --enable-crash-on-assert
 ######################################################################
 # disable unneeded to speed up and/or save space
 ac_add_options --disable-auto-deps
@@ -46,7 +45,12 @@ ac_add_options --disable-bidi
 ac_add_options --disable-dtd-debug
 ac_add_options --disable-jsd
 ac_add_options --disable-ldap
-ac_add_options --disable-logging
 ac_add_options --disable-pedantic
 ac_add_options --disable-xinerama
+if test -n "$WITH_DEBUG"; then
+    ac_add_options --enable-debug
+    ac_add_options --enable-logging
+else
+    ac_add_options --disable-logging
+fi # test -n "$WITH_DEBUG"
 ######################################################################
diff --git a/www/firefox-devel/files/patch-nsprpub-pr-src-pthrads-ptio.c b/www/firefox-devel/files/patch-nsprpub-pr-src-pthrads-ptio.c
deleted file mode 100644
index 4a965d4c7440..000000000000
--- a/www/firefox-devel/files/patch-nsprpub-pr-src-pthrads-ptio.c
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: nsprpub/pr/src/pthreads/ptio.c
-diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c
---- nsprpub/pr/src/pthreads/ptio.c.orig	Fri Apr 12 03:14:39 2002
-+++ nsprpub/pr/src/pthreads/ptio.c	Tue Jul 30 18:52:11 2002
-@@ -3414,6 +3414,17 @@
-     if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
-     else
-     {
-+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
-+	defined(__FreeBSD__) && defined(IPV6_V6ONLY)
-+		if (domain == PR_AF_INET6) {
-+			int opt = 0;
-+			if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
-+                           &opt, sizeof(opt))) {
-+				close(osfd);
-+				return NULL;
-+			}
-+		}
-+#endif
-         fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
-         if (fd == NULL) close(osfd);
-     }
diff --git a/www/firefox-devel/pkg-message b/www/firefox-devel/pkg-message
index f1a5088fdf25..29cb864c176f 100644
--- a/www/firefox-devel/pkg-message
+++ b/www/firefox-devel/pkg-message
@@ -1,39 +1,4 @@
 ======================================================================
-0.4_10:
-Backdown with makefile mods left in place.
-
-0.5.20021209:
-Phoenix 0.5 snap on 20021209. Most of the files are PHOENIX_0_5_RELEASE,
-but they didn't tag the browser and toolkit dirs, so those are from this
-AM.
-
-****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 no port ever finds it and it was breaking
-the build.
-
-This version is broken. Backed down to 0.4_10
-
--- AlanE <phoenix@freebsd.org>
-
-0.4_9:
-Install link to java plugin.
-Build plist after install using find/sed.
-
-0.4_8:
-Add patch to fix network ops on -CURRENT.
-
 As of version 0.4_7, this port appears to be stable *again*. It 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.
@@ -59,4 +24,37 @@ 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 Phoenix.
 The Maintainers (alane@ & trevor@)
+
+Additional notes:
+
+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.
+-- AlanE <phoenix@freebsd.org>
+
 ======================================================================
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 4737767c1d58..87ad5278d832 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -8,11 +8,11 @@
 #
 
 PORTNAME=		phoenix
-PORTVERSION=		0.4
-PORTREVISION=		10
+PORTVERSION=		0.5
+PORTREVISION=		1
 CATEGORIES=		www # pita
-MASTER_SITES=		${MASTER_SITE_LOCAL} # ${BSD_WEBDIR}
-MASTER_SITE_SUBDIR=	trevor
+MASTER_SITES=		${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
+MASTER_SITE_SUBDIR=	alane
 
 MAINTAINER=		phoenix@freebsd.org # alane@fbsd and trevor@fbsd
 
@@ -39,18 +39,12 @@ HAS_CONFIGURE=		yes
 USE_GNOMENG=		yes
 USE_GNOME=		gtk12 orbit
 
-CPPFLAGS+=		-I${X11BASE}/include
-CFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		-L${X11BASE}/lib
-LIBS+=			${PTHREAD_LIBS}
-
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
 LOCAL_SUBDIR=		lib/${PORTNAME}
 LOCAL_PREFIX=		${PREFIX}/${LOCAL_SUBDIR}
 JREDIR=			${LOCALBASE}/jdk1.3.1/jre
-MOZVER=			1.2b
-#MOZVER=		1.3a
+MOZVER=			1.3a
 PLUGINSDIR=		${LOCAL_PREFIX}/lib/mozilla-${MOZVER}/plugins/
 
 .include <bsd.port.pre.mk>
@@ -65,6 +59,21 @@ BROKEN+="please make sure you have issued the command 'use.perl port'"
 SORT?=/usr/bin/sort
 PLIST=${WRKDIR}/plist
 
+.if defined(WITH_DEBUG)
+WITHOUT_OPTIMIZE=	yes
+CONFIGURE_ENV+=		WITH_DEBUG=yes
+.endif # defined(WITH_DEBUG)
+
+.if !defined(WITHOUT_OPTIMIZE)
+CFLAGS+=		-O2
+.endif # defined(WITH_OPTIMIZE)
+
+
+CPPFLAGS+=		-I${X11BASE}/include
+CFLAGS+=		${PTHREAD_CFLAGS}
+LDFLAGS+=		-L${X11BASE}/lib
+LIBS+=			${PTHREAD_LIBS}
+
 pre-extract::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Extracting source (this takes a while) ..."
@@ -130,6 +139,12 @@ cons-plist:
 
 .include <bsd.port.post.mk>
 
-generate-plist: link-bins link-java cleanup-install cons-plist
+# <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: link-bins cleanup-install cons-plist
 
 #EOF
diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo
index f61de58d19c1..4199aae89c1e 100644
--- a/www/firefox-esr/distinfo
+++ b/www/firefox-esr/distinfo
@@ -1 +1 @@
-MD5 (phoenix-0.4.tar.bz2) = 4b697330d5fde906b1a6169b80b60102
+MD5 (phoenix-0.5.tar.bz2) = fb99a5a866a99fbb15269699a1022b47
diff --git a/www/firefox-esr/files/mozconfig.in b/www/firefox-esr/files/mozconfig.in
index c6beb3bb3703..2bea08b6719a 100644
--- a/www/firefox-esr/files/mozconfig.in
+++ b/www/firefox-esr/files/mozconfig.in
@@ -38,7 +38,6 @@ ac_add_options --with-pthreads
 ac_add_options --enable-xft
 ac_add_options --enable-reorder
 ac_add_options --enable-strip
-#ac_add_options --enable-crash-on-assert
 ######################################################################
 # disable unneeded to speed up and/or save space
 ac_add_options --disable-auto-deps
@@ -46,7 +45,12 @@ ac_add_options --disable-bidi
 ac_add_options --disable-dtd-debug
 ac_add_options --disable-jsd
 ac_add_options --disable-ldap
-ac_add_options --disable-logging
 ac_add_options --disable-pedantic
 ac_add_options --disable-xinerama
+if test -n "$WITH_DEBUG"; then
+    ac_add_options --enable-debug
+    ac_add_options --enable-logging
+else
+    ac_add_options --disable-logging
+fi # test -n "$WITH_DEBUG"
 ######################################################################
diff --git a/www/firefox-esr/files/patch-nsprpub-pr-src-pthrads-ptio.c b/www/firefox-esr/files/patch-nsprpub-pr-src-pthrads-ptio.c
deleted file mode 100644
index 4a965d4c7440..000000000000
--- a/www/firefox-esr/files/patch-nsprpub-pr-src-pthrads-ptio.c
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: nsprpub/pr/src/pthreads/ptio.c
-diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c
---- nsprpub/pr/src/pthreads/ptio.c.orig	Fri Apr 12 03:14:39 2002
-+++ nsprpub/pr/src/pthreads/ptio.c	Tue Jul 30 18:52:11 2002
-@@ -3414,6 +3414,17 @@
-     if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
-     else
-     {
-+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
-+	defined(__FreeBSD__) && defined(IPV6_V6ONLY)
-+		if (domain == PR_AF_INET6) {
-+			int opt = 0;
-+			if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
-+                           &opt, sizeof(opt))) {
-+				close(osfd);
-+				return NULL;
-+			}
-+		}
-+#endif
-         fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
-         if (fd == NULL) close(osfd);
-     }
diff --git a/www/firefox-esr/pkg-message b/www/firefox-esr/pkg-message
index f1a5088fdf25..29cb864c176f 100644
--- a/www/firefox-esr/pkg-message
+++ b/www/firefox-esr/pkg-message
@@ -1,39 +1,4 @@
 ======================================================================
-0.4_10:
-Backdown with makefile mods left in place.
-
-0.5.20021209:
-Phoenix 0.5 snap on 20021209. Most of the files are PHOENIX_0_5_RELEASE,
-but they didn't tag the browser and toolkit dirs, so those are from this
-AM.
-
-****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 no port ever finds it and it was breaking
-the build.
-
-This version is broken. Backed down to 0.4_10
-
--- AlanE <phoenix@freebsd.org>
-
-0.4_9:
-Install link to java plugin.
-Build plist after install using find/sed.
-
-0.4_8:
-Add patch to fix network ops on -CURRENT.
-
 As of version 0.4_7, this port appears to be stable *again*. It 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.
@@ -59,4 +24,37 @@ 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 Phoenix.
 The Maintainers (alane@ & trevor@)
+
+Additional notes:
+
+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.
+-- AlanE <phoenix@freebsd.org>
+
 ======================================================================
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 4737767c1d58..87ad5278d832 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -8,11 +8,11 @@
 #
 
 PORTNAME=		phoenix
-PORTVERSION=		0.4
-PORTREVISION=		10
+PORTVERSION=		0.5
+PORTREVISION=		1
 CATEGORIES=		www # pita
-MASTER_SITES=		${MASTER_SITE_LOCAL} # ${BSD_WEBDIR}
-MASTER_SITE_SUBDIR=	trevor
+MASTER_SITES=		${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
+MASTER_SITE_SUBDIR=	alane
 
 MAINTAINER=		phoenix@freebsd.org # alane@fbsd and trevor@fbsd
 
@@ -39,18 +39,12 @@ HAS_CONFIGURE=		yes
 USE_GNOMENG=		yes
 USE_GNOME=		gtk12 orbit
 
-CPPFLAGS+=		-I${X11BASE}/include
-CFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		-L${X11BASE}/lib
-LIBS+=			${PTHREAD_LIBS}
-
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
 LOCAL_SUBDIR=		lib/${PORTNAME}
 LOCAL_PREFIX=		${PREFIX}/${LOCAL_SUBDIR}
 JREDIR=			${LOCALBASE}/jdk1.3.1/jre
-MOZVER=			1.2b
-#MOZVER=		1.3a
+MOZVER=			1.3a
 PLUGINSDIR=		${LOCAL_PREFIX}/lib/mozilla-${MOZVER}/plugins/
 
 .include <bsd.port.pre.mk>
@@ -65,6 +59,21 @@ BROKEN+="please make sure you have issued the command 'use.perl port'"
 SORT?=/usr/bin/sort
 PLIST=${WRKDIR}/plist
 
+.if defined(WITH_DEBUG)
+WITHOUT_OPTIMIZE=	yes
+CONFIGURE_ENV+=		WITH_DEBUG=yes
+.endif # defined(WITH_DEBUG)
+
+.if !defined(WITHOUT_OPTIMIZE)
+CFLAGS+=		-O2
+.endif # defined(WITH_OPTIMIZE)
+
+
+CPPFLAGS+=		-I${X11BASE}/include
+CFLAGS+=		${PTHREAD_CFLAGS}
+LDFLAGS+=		-L${X11BASE}/lib
+LIBS+=			${PTHREAD_LIBS}
+
 pre-extract::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Extracting source (this takes a while) ..."
@@ -130,6 +139,12 @@ cons-plist:
 
 .include <bsd.port.post.mk>
 
-generate-plist: link-bins link-java cleanup-install cons-plist
+# <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: link-bins cleanup-install cons-plist
 
 #EOF
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index f61de58d19c1..4199aae89c1e 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1 +1 @@
-MD5 (phoenix-0.4.tar.bz2) = 4b697330d5fde906b1a6169b80b60102
+MD5 (phoenix-0.5.tar.bz2) = fb99a5a866a99fbb15269699a1022b47
diff --git a/www/firefox/files/mozconfig.in b/www/firefox/files/mozconfig.in
index c6beb3bb3703..2bea08b6719a 100644
--- a/www/firefox/files/mozconfig.in
+++ b/www/firefox/files/mozconfig.in
@@ -38,7 +38,6 @@ ac_add_options --with-pthreads
 ac_add_options --enable-xft
 ac_add_options --enable-reorder
 ac_add_options --enable-strip
-#ac_add_options --enable-crash-on-assert
 ######################################################################
 # disable unneeded to speed up and/or save space
 ac_add_options --disable-auto-deps
@@ -46,7 +45,12 @@ ac_add_options --disable-bidi
 ac_add_options --disable-dtd-debug
 ac_add_options --disable-jsd
 ac_add_options --disable-ldap
-ac_add_options --disable-logging
 ac_add_options --disable-pedantic
 ac_add_options --disable-xinerama
+if test -n "$WITH_DEBUG"; then
+    ac_add_options --enable-debug
+    ac_add_options --enable-logging
+else
+    ac_add_options --disable-logging
+fi # test -n "$WITH_DEBUG"
 ######################################################################
diff --git a/www/firefox/files/patch-nsprpub-pr-src-pthrads-ptio.c b/www/firefox/files/patch-nsprpub-pr-src-pthrads-ptio.c
deleted file mode 100644
index 4a965d4c7440..000000000000
--- a/www/firefox/files/patch-nsprpub-pr-src-pthrads-ptio.c
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: nsprpub/pr/src/pthreads/ptio.c
-diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c
---- nsprpub/pr/src/pthreads/ptio.c.orig	Fri Apr 12 03:14:39 2002
-+++ nsprpub/pr/src/pthreads/ptio.c	Tue Jul 30 18:52:11 2002
-@@ -3414,6 +3414,17 @@
-     if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
-     else
-     {
-+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
-+	defined(__FreeBSD__) && defined(IPV6_V6ONLY)
-+		if (domain == PR_AF_INET6) {
-+			int opt = 0;
-+			if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
-+                           &opt, sizeof(opt))) {
-+				close(osfd);
-+				return NULL;
-+			}
-+		}
-+#endif
-         fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
-         if (fd == NULL) close(osfd);
-     }
diff --git a/www/firefox/pkg-message b/www/firefox/pkg-message
index f1a5088fdf25..29cb864c176f 100644
--- a/www/firefox/pkg-message
+++ b/www/firefox/pkg-message
@@ -1,39 +1,4 @@
 ======================================================================
-0.4_10:
-Backdown with makefile mods left in place.
-
-0.5.20021209:
-Phoenix 0.5 snap on 20021209. Most of the files are PHOENIX_0_5_RELEASE,
-but they didn't tag the browser and toolkit dirs, so those are from this
-AM.
-
-****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 no port ever finds it and it was breaking
-the build.
-
-This version is broken. Backed down to 0.4_10
-
--- AlanE <phoenix@freebsd.org>
-
-0.4_9:
-Install link to java plugin.
-Build plist after install using find/sed.
-
-0.4_8:
-Add patch to fix network ops on -CURRENT.
-
 As of version 0.4_7, this port appears to be stable *again*. It 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.
@@ -59,4 +24,37 @@ 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 Phoenix.
 The Maintainers (alane@ & trevor@)
+
+Additional notes:
+
+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.
+-- AlanE <phoenix@freebsd.org>
+
 ======================================================================
diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile
index 4737767c1d58..87ad5278d832 100644
--- a/www/firefox10/Makefile
+++ b/www/firefox10/Makefile
@@ -8,11 +8,11 @@
 #
 
 PORTNAME=		phoenix
-PORTVERSION=		0.4
-PORTREVISION=		10
+PORTVERSION=		0.5
+PORTREVISION=		1
 CATEGORIES=		www # pita
-MASTER_SITES=		${MASTER_SITE_LOCAL} # ${BSD_WEBDIR}
-MASTER_SITE_SUBDIR=	trevor
+MASTER_SITES=		${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
+MASTER_SITE_SUBDIR=	alane
 
 MAINTAINER=		phoenix@freebsd.org # alane@fbsd and trevor@fbsd
 
@@ -39,18 +39,12 @@ HAS_CONFIGURE=		yes
 USE_GNOMENG=		yes
 USE_GNOME=		gtk12 orbit
 
-CPPFLAGS+=		-I${X11BASE}/include
-CFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		-L${X11BASE}/lib
-LIBS+=			${PTHREAD_LIBS}
-
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
 LOCAL_SUBDIR=		lib/${PORTNAME}
 LOCAL_PREFIX=		${PREFIX}/${LOCAL_SUBDIR}
 JREDIR=			${LOCALBASE}/jdk1.3.1/jre
-MOZVER=			1.2b
-#MOZVER=		1.3a
+MOZVER=			1.3a
 PLUGINSDIR=		${LOCAL_PREFIX}/lib/mozilla-${MOZVER}/plugins/
 
 .include <bsd.port.pre.mk>
@@ -65,6 +59,21 @@ BROKEN+="please make sure you have issued the command 'use.perl port'"
 SORT?=/usr/bin/sort
 PLIST=${WRKDIR}/plist
 
+.if defined(WITH_DEBUG)
+WITHOUT_OPTIMIZE=	yes
+CONFIGURE_ENV+=		WITH_DEBUG=yes
+.endif # defined(WITH_DEBUG)
+
+.if !defined(WITHOUT_OPTIMIZE)
+CFLAGS+=		-O2
+.endif # defined(WITH_OPTIMIZE)
+
+
+CPPFLAGS+=		-I${X11BASE}/include
+CFLAGS+=		${PTHREAD_CFLAGS}
+LDFLAGS+=		-L${X11BASE}/lib
+LIBS+=			${PTHREAD_LIBS}
+
 pre-extract::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Extracting source (this takes a while) ..."
@@ -130,6 +139,12 @@ cons-plist:
 
 .include <bsd.port.post.mk>
 
-generate-plist: link-bins link-java cleanup-install cons-plist
+# <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: link-bins cleanup-install cons-plist
 
 #EOF
diff --git a/www/firefox10/distinfo b/www/firefox10/distinfo
index f61de58d19c1..4199aae89c1e 100644
--- a/www/firefox10/distinfo
+++ b/www/firefox10/distinfo
@@ -1 +1 @@
-MD5 (phoenix-0.4.tar.bz2) = 4b697330d5fde906b1a6169b80b60102
+MD5 (phoenix-0.5.tar.bz2) = fb99a5a866a99fbb15269699a1022b47
diff --git a/www/firefox10/files/mozconfig.in b/www/firefox10/files/mozconfig.in
index c6beb3bb3703..2bea08b6719a 100644
--- a/www/firefox10/files/mozconfig.in
+++ b/www/firefox10/files/mozconfig.in
@@ -38,7 +38,6 @@ ac_add_options --with-pthreads
 ac_add_options --enable-xft
 ac_add_options --enable-reorder
 ac_add_options --enable-strip
-#ac_add_options --enable-crash-on-assert
 ######################################################################
 # disable unneeded to speed up and/or save space
 ac_add_options --disable-auto-deps
@@ -46,7 +45,12 @@ ac_add_options --disable-bidi
 ac_add_options --disable-dtd-debug
 ac_add_options --disable-jsd
 ac_add_options --disable-ldap
-ac_add_options --disable-logging
 ac_add_options --disable-pedantic
 ac_add_options --disable-xinerama
+if test -n "$WITH_DEBUG"; then
+    ac_add_options --enable-debug
+    ac_add_options --enable-logging
+else
+    ac_add_options --disable-logging
+fi # test -n "$WITH_DEBUG"
 ######################################################################
diff --git a/www/firefox10/files/patch-nsprpub-pr-src-pthrads-ptio.c b/www/firefox10/files/patch-nsprpub-pr-src-pthrads-ptio.c
deleted file mode 100644
index 4a965d4c7440..000000000000
--- a/www/firefox10/files/patch-nsprpub-pr-src-pthrads-ptio.c
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: nsprpub/pr/src/pthreads/ptio.c
-diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c
---- nsprpub/pr/src/pthreads/ptio.c.orig	Fri Apr 12 03:14:39 2002
-+++ nsprpub/pr/src/pthreads/ptio.c	Tue Jul 30 18:52:11 2002
-@@ -3414,6 +3414,17 @@
-     if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
-     else
-     {
-+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
-+	defined(__FreeBSD__) && defined(IPV6_V6ONLY)
-+		if (domain == PR_AF_INET6) {
-+			int opt = 0;
-+			if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
-+                           &opt, sizeof(opt))) {
-+				close(osfd);
-+				return NULL;
-+			}
-+		}
-+#endif
-         fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
-         if (fd == NULL) close(osfd);
-     }
diff --git a/www/firefox10/pkg-message b/www/firefox10/pkg-message
index f1a5088fdf25..29cb864c176f 100644
--- a/www/firefox10/pkg-message
+++ b/www/firefox10/pkg-message
@@ -1,39 +1,4 @@
 ======================================================================
-0.4_10:
-Backdown with makefile mods left in place.
-
-0.5.20021209:
-Phoenix 0.5 snap on 20021209. Most of the files are PHOENIX_0_5_RELEASE,
-but they didn't tag the browser and toolkit dirs, so those are from this
-AM.
-
-****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 no port ever finds it and it was breaking
-the build.
-
-This version is broken. Backed down to 0.4_10
-
--- AlanE <phoenix@freebsd.org>
-
-0.4_9:
-Install link to java plugin.
-Build plist after install using find/sed.
-
-0.4_8:
-Add patch to fix network ops on -CURRENT.
-
 As of version 0.4_7, this port appears to be stable *again*. It 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.
@@ -59,4 +24,37 @@ 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 Phoenix.
 The Maintainers (alane@ & trevor@)
+
+Additional notes:
+
+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.
+-- AlanE <phoenix@freebsd.org>
+
 ======================================================================
diff --git a/www/firefox15/Makefile b/www/firefox15/Makefile
index 4737767c1d58..87ad5278d832 100644
--- a/www/firefox15/Makefile
+++ b/www/firefox15/Makefile
@@ -8,11 +8,11 @@
 #
 
 PORTNAME=		phoenix
-PORTVERSION=		0.4
-PORTREVISION=		10
+PORTVERSION=		0.5
+PORTREVISION=		1
 CATEGORIES=		www # pita
-MASTER_SITES=		${MASTER_SITE_LOCAL} # ${BSD_WEBDIR}
-MASTER_SITE_SUBDIR=	trevor
+MASTER_SITES=		${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
+MASTER_SITE_SUBDIR=	alane
 
 MAINTAINER=		phoenix@freebsd.org # alane@fbsd and trevor@fbsd
 
@@ -39,18 +39,12 @@ HAS_CONFIGURE=		yes
 USE_GNOMENG=		yes
 USE_GNOME=		gtk12 orbit
 
-CPPFLAGS+=		-I${X11BASE}/include
-CFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		-L${X11BASE}/lib
-LIBS+=			${PTHREAD_LIBS}
-
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
 LOCAL_SUBDIR=		lib/${PORTNAME}
 LOCAL_PREFIX=		${PREFIX}/${LOCAL_SUBDIR}
 JREDIR=			${LOCALBASE}/jdk1.3.1/jre
-MOZVER=			1.2b
-#MOZVER=		1.3a
+MOZVER=			1.3a
 PLUGINSDIR=		${LOCAL_PREFIX}/lib/mozilla-${MOZVER}/plugins/
 
 .include <bsd.port.pre.mk>
@@ -65,6 +59,21 @@ BROKEN+="please make sure you have issued the command 'use.perl port'"
 SORT?=/usr/bin/sort
 PLIST=${WRKDIR}/plist
 
+.if defined(WITH_DEBUG)
+WITHOUT_OPTIMIZE=	yes
+CONFIGURE_ENV+=		WITH_DEBUG=yes
+.endif # defined(WITH_DEBUG)
+
+.if !defined(WITHOUT_OPTIMIZE)
+CFLAGS+=		-O2
+.endif # defined(WITH_OPTIMIZE)
+
+
+CPPFLAGS+=		-I${X11BASE}/include
+CFLAGS+=		${PTHREAD_CFLAGS}
+LDFLAGS+=		-L${X11BASE}/lib
+LIBS+=			${PTHREAD_LIBS}
+
 pre-extract::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Extracting source (this takes a while) ..."
@@ -130,6 +139,12 @@ cons-plist:
 
 .include <bsd.port.post.mk>
 
-generate-plist: link-bins link-java cleanup-install cons-plist
+# <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: link-bins cleanup-install cons-plist
 
 #EOF
diff --git a/www/firefox15/distinfo b/www/firefox15/distinfo
index f61de58d19c1..4199aae89c1e 100644
--- a/www/firefox15/distinfo
+++ b/www/firefox15/distinfo
@@ -1 +1 @@
-MD5 (phoenix-0.4.tar.bz2) = 4b697330d5fde906b1a6169b80b60102
+MD5 (phoenix-0.5.tar.bz2) = fb99a5a866a99fbb15269699a1022b47
diff --git a/www/firefox15/files/mozconfig.in b/www/firefox15/files/mozconfig.in
index c6beb3bb3703..2bea08b6719a 100644
--- a/www/firefox15/files/mozconfig.in
+++ b/www/firefox15/files/mozconfig.in
@@ -38,7 +38,6 @@ ac_add_options --with-pthreads
 ac_add_options --enable-xft
 ac_add_options --enable-reorder
 ac_add_options --enable-strip
-#ac_add_options --enable-crash-on-assert
 ######################################################################
 # disable unneeded to speed up and/or save space
 ac_add_options --disable-auto-deps
@@ -46,7 +45,12 @@ ac_add_options --disable-bidi
 ac_add_options --disable-dtd-debug
 ac_add_options --disable-jsd
 ac_add_options --disable-ldap
-ac_add_options --disable-logging
 ac_add_options --disable-pedantic
 ac_add_options --disable-xinerama
+if test -n "$WITH_DEBUG"; then
+    ac_add_options --enable-debug
+    ac_add_options --enable-logging
+else
+    ac_add_options --disable-logging
+fi # test -n "$WITH_DEBUG"
 ######################################################################
diff --git a/www/firefox15/files/patch-nsprpub-pr-src-pthrads-ptio.c b/www/firefox15/files/patch-nsprpub-pr-src-pthrads-ptio.c
deleted file mode 100644
index 4a965d4c7440..000000000000
--- a/www/firefox15/files/patch-nsprpub-pr-src-pthrads-ptio.c
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: nsprpub/pr/src/pthreads/ptio.c
-diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c
---- nsprpub/pr/src/pthreads/ptio.c.orig	Fri Apr 12 03:14:39 2002
-+++ nsprpub/pr/src/pthreads/ptio.c	Tue Jul 30 18:52:11 2002
-@@ -3414,6 +3414,17 @@
-     if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
-     else
-     {
-+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
-+	defined(__FreeBSD__) && defined(IPV6_V6ONLY)
-+		if (domain == PR_AF_INET6) {
-+			int opt = 0;
-+			if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
-+                           &opt, sizeof(opt))) {
-+				close(osfd);
-+				return NULL;
-+			}
-+		}
-+#endif
-         fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
-         if (fd == NULL) close(osfd);
-     }
diff --git a/www/firefox15/pkg-message b/www/firefox15/pkg-message
index f1a5088fdf25..29cb864c176f 100644
--- a/www/firefox15/pkg-message
+++ b/www/firefox15/pkg-message
@@ -1,39 +1,4 @@
 ======================================================================
-0.4_10:
-Backdown with makefile mods left in place.
-
-0.5.20021209:
-Phoenix 0.5 snap on 20021209. Most of the files are PHOENIX_0_5_RELEASE,
-but they didn't tag the browser and toolkit dirs, so those are from this
-AM.
-
-****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 no port ever finds it and it was breaking
-the build.
-
-This version is broken. Backed down to 0.4_10
-
--- AlanE <phoenix@freebsd.org>
-
-0.4_9:
-Install link to java plugin.
-Build plist after install using find/sed.
-
-0.4_8:
-Add patch to fix network ops on -CURRENT.
-
 As of version 0.4_7, this port appears to be stable *again*. It 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.
@@ -59,4 +24,37 @@ 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 Phoenix.
 The Maintainers (alane@ & trevor@)
+
+Additional notes:
+
+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.
+-- AlanE <phoenix@freebsd.org>
+
 ======================================================================
diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile
index 4737767c1d58..87ad5278d832 100644
--- a/www/firefox3-devel/Makefile
+++ b/www/firefox3-devel/Makefile
@@ -8,11 +8,11 @@
 #
 
 PORTNAME=		phoenix
-PORTVERSION=		0.4
-PORTREVISION=		10
+PORTVERSION=		0.5
+PORTREVISION=		1
 CATEGORIES=		www # pita
-MASTER_SITES=		${MASTER_SITE_LOCAL} # ${BSD_WEBDIR}
-MASTER_SITE_SUBDIR=	trevor
+MASTER_SITES=		${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
+MASTER_SITE_SUBDIR=	alane
 
 MAINTAINER=		phoenix@freebsd.org # alane@fbsd and trevor@fbsd
 
@@ -39,18 +39,12 @@ HAS_CONFIGURE=		yes
 USE_GNOMENG=		yes
 USE_GNOME=		gtk12 orbit
 
-CPPFLAGS+=		-I${X11BASE}/include
-CFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		-L${X11BASE}/lib
-LIBS+=			${PTHREAD_LIBS}
-
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
 LOCAL_SUBDIR=		lib/${PORTNAME}
 LOCAL_PREFIX=		${PREFIX}/${LOCAL_SUBDIR}
 JREDIR=			${LOCALBASE}/jdk1.3.1/jre
-MOZVER=			1.2b
-#MOZVER=		1.3a
+MOZVER=			1.3a
 PLUGINSDIR=		${LOCAL_PREFIX}/lib/mozilla-${MOZVER}/plugins/
 
 .include <bsd.port.pre.mk>
@@ -65,6 +59,21 @@ BROKEN+="please make sure you have issued the command 'use.perl port'"
 SORT?=/usr/bin/sort
 PLIST=${WRKDIR}/plist
 
+.if defined(WITH_DEBUG)
+WITHOUT_OPTIMIZE=	yes
+CONFIGURE_ENV+=		WITH_DEBUG=yes
+.endif # defined(WITH_DEBUG)
+
+.if !defined(WITHOUT_OPTIMIZE)
+CFLAGS+=		-O2
+.endif # defined(WITH_OPTIMIZE)
+
+
+CPPFLAGS+=		-I${X11BASE}/include
+CFLAGS+=		${PTHREAD_CFLAGS}
+LDFLAGS+=		-L${X11BASE}/lib
+LIBS+=			${PTHREAD_LIBS}
+
 pre-extract::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Extracting source (this takes a while) ..."
@@ -130,6 +139,12 @@ cons-plist:
 
 .include <bsd.port.post.mk>
 
-generate-plist: link-bins link-java cleanup-install cons-plist
+# <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: link-bins cleanup-install cons-plist
 
 #EOF
diff --git a/www/firefox3-devel/distinfo b/www/firefox3-devel/distinfo
index f61de58d19c1..4199aae89c1e 100644
--- a/www/firefox3-devel/distinfo
+++ b/www/firefox3-devel/distinfo
@@ -1 +1 @@
-MD5 (phoenix-0.4.tar.bz2) = 4b697330d5fde906b1a6169b80b60102
+MD5 (phoenix-0.5.tar.bz2) = fb99a5a866a99fbb15269699a1022b47
diff --git a/www/firefox3-devel/files/mozconfig.in b/www/firefox3-devel/files/mozconfig.in
index c6beb3bb3703..2bea08b6719a 100644
--- a/www/firefox3-devel/files/mozconfig.in
+++ b/www/firefox3-devel/files/mozconfig.in
@@ -38,7 +38,6 @@ ac_add_options --with-pthreads
 ac_add_options --enable-xft
 ac_add_options --enable-reorder
 ac_add_options --enable-strip
-#ac_add_options --enable-crash-on-assert
 ######################################################################
 # disable unneeded to speed up and/or save space
 ac_add_options --disable-auto-deps
@@ -46,7 +45,12 @@ ac_add_options --disable-bidi
 ac_add_options --disable-dtd-debug
 ac_add_options --disable-jsd
 ac_add_options --disable-ldap
-ac_add_options --disable-logging
 ac_add_options --disable-pedantic
 ac_add_options --disable-xinerama
+if test -n "$WITH_DEBUG"; then
+    ac_add_options --enable-debug
+    ac_add_options --enable-logging
+else
+    ac_add_options --disable-logging
+fi # test -n "$WITH_DEBUG"
 ######################################################################
diff --git a/www/firefox3-devel/files/patch-nsprpub-pr-src-pthrads-ptio.c b/www/firefox3-devel/files/patch-nsprpub-pr-src-pthrads-ptio.c
deleted file mode 100644
index 4a965d4c7440..000000000000
--- a/www/firefox3-devel/files/patch-nsprpub-pr-src-pthrads-ptio.c
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: nsprpub/pr/src/pthreads/ptio.c
-diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c
---- nsprpub/pr/src/pthreads/ptio.c.orig	Fri Apr 12 03:14:39 2002
-+++ nsprpub/pr/src/pthreads/ptio.c	Tue Jul 30 18:52:11 2002
-@@ -3414,6 +3414,17 @@
-     if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
-     else
-     {
-+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
-+	defined(__FreeBSD__) && defined(IPV6_V6ONLY)
-+		if (domain == PR_AF_INET6) {
-+			int opt = 0;
-+			if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
-+                           &opt, sizeof(opt))) {
-+				close(osfd);
-+				return NULL;
-+			}
-+		}
-+#endif
-         fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
-         if (fd == NULL) close(osfd);
-     }
diff --git a/www/firefox3-devel/pkg-message b/www/firefox3-devel/pkg-message
index f1a5088fdf25..29cb864c176f 100644
--- a/www/firefox3-devel/pkg-message
+++ b/www/firefox3-devel/pkg-message
@@ -1,39 +1,4 @@
 ======================================================================
-0.4_10:
-Backdown with makefile mods left in place.
-
-0.5.20021209:
-Phoenix 0.5 snap on 20021209. Most of the files are PHOENIX_0_5_RELEASE,
-but they didn't tag the browser and toolkit dirs, so those are from this
-AM.
-
-****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 no port ever finds it and it was breaking
-the build.
-
-This version is broken. Backed down to 0.4_10
-
--- AlanE <phoenix@freebsd.org>
-
-0.4_9:
-Install link to java plugin.
-Build plist after install using find/sed.
-
-0.4_8:
-Add patch to fix network ops on -CURRENT.
-
 As of version 0.4_7, this port appears to be stable *again*. It 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.
@@ -59,4 +24,37 @@ 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 Phoenix.
 The Maintainers (alane@ & trevor@)
+
+Additional notes:
+
+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.
+-- AlanE <phoenix@freebsd.org>
+
 ======================================================================
diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile
index 4737767c1d58..87ad5278d832 100644
--- a/www/firefox35/Makefile
+++ b/www/firefox35/Makefile
@@ -8,11 +8,11 @@
 #
 
 PORTNAME=		phoenix
-PORTVERSION=		0.4
-PORTREVISION=		10
+PORTVERSION=		0.5
+PORTREVISION=		1
 CATEGORIES=		www # pita
-MASTER_SITES=		${MASTER_SITE_LOCAL} # ${BSD_WEBDIR}
-MASTER_SITE_SUBDIR=	trevor
+MASTER_SITES=		${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
+MASTER_SITE_SUBDIR=	alane
 
 MAINTAINER=		phoenix@freebsd.org # alane@fbsd and trevor@fbsd
 
@@ -39,18 +39,12 @@ HAS_CONFIGURE=		yes
 USE_GNOMENG=		yes
 USE_GNOME=		gtk12 orbit
 
-CPPFLAGS+=		-I${X11BASE}/include
-CFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		-L${X11BASE}/lib
-LIBS+=			${PTHREAD_LIBS}
-
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
 LOCAL_SUBDIR=		lib/${PORTNAME}
 LOCAL_PREFIX=		${PREFIX}/${LOCAL_SUBDIR}
 JREDIR=			${LOCALBASE}/jdk1.3.1/jre
-MOZVER=			1.2b
-#MOZVER=		1.3a
+MOZVER=			1.3a
 PLUGINSDIR=		${LOCAL_PREFIX}/lib/mozilla-${MOZVER}/plugins/
 
 .include <bsd.port.pre.mk>
@@ -65,6 +59,21 @@ BROKEN+="please make sure you have issued the command 'use.perl port'"
 SORT?=/usr/bin/sort
 PLIST=${WRKDIR}/plist
 
+.if defined(WITH_DEBUG)
+WITHOUT_OPTIMIZE=	yes
+CONFIGURE_ENV+=		WITH_DEBUG=yes
+.endif # defined(WITH_DEBUG)
+
+.if !defined(WITHOUT_OPTIMIZE)
+CFLAGS+=		-O2
+.endif # defined(WITH_OPTIMIZE)
+
+
+CPPFLAGS+=		-I${X11BASE}/include
+CFLAGS+=		${PTHREAD_CFLAGS}
+LDFLAGS+=		-L${X11BASE}/lib
+LIBS+=			${PTHREAD_LIBS}
+
 pre-extract::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Extracting source (this takes a while) ..."
@@ -130,6 +139,12 @@ cons-plist:
 
 .include <bsd.port.post.mk>
 
-generate-plist: link-bins link-java cleanup-install cons-plist
+# <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: link-bins cleanup-install cons-plist
 
 #EOF
diff --git a/www/firefox35/distinfo b/www/firefox35/distinfo
index f61de58d19c1..4199aae89c1e 100644
--- a/www/firefox35/distinfo
+++ b/www/firefox35/distinfo
@@ -1 +1 @@
-MD5 (phoenix-0.4.tar.bz2) = 4b697330d5fde906b1a6169b80b60102
+MD5 (phoenix-0.5.tar.bz2) = fb99a5a866a99fbb15269699a1022b47
diff --git a/www/firefox35/files/mozconfig.in b/www/firefox35/files/mozconfig.in
index c6beb3bb3703..2bea08b6719a 100644
--- a/www/firefox35/files/mozconfig.in
+++ b/www/firefox35/files/mozconfig.in
@@ -38,7 +38,6 @@ ac_add_options --with-pthreads
 ac_add_options --enable-xft
 ac_add_options --enable-reorder
 ac_add_options --enable-strip
-#ac_add_options --enable-crash-on-assert
 ######################################################################
 # disable unneeded to speed up and/or save space
 ac_add_options --disable-auto-deps
@@ -46,7 +45,12 @@ ac_add_options --disable-bidi
 ac_add_options --disable-dtd-debug
 ac_add_options --disable-jsd
 ac_add_options --disable-ldap
-ac_add_options --disable-logging
 ac_add_options --disable-pedantic
 ac_add_options --disable-xinerama
+if test -n "$WITH_DEBUG"; then
+    ac_add_options --enable-debug
+    ac_add_options --enable-logging
+else
+    ac_add_options --disable-logging
+fi # test -n "$WITH_DEBUG"
 ######################################################################
diff --git a/www/firefox35/files/patch-nsprpub-pr-src-pthrads-ptio.c b/www/firefox35/files/patch-nsprpub-pr-src-pthrads-ptio.c
deleted file mode 100644
index 4a965d4c7440..000000000000
--- a/www/firefox35/files/patch-nsprpub-pr-src-pthrads-ptio.c
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: nsprpub/pr/src/pthreads/ptio.c
-diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c
---- nsprpub/pr/src/pthreads/ptio.c.orig	Fri Apr 12 03:14:39 2002
-+++ nsprpub/pr/src/pthreads/ptio.c	Tue Jul 30 18:52:11 2002
-@@ -3414,6 +3414,17 @@
-     if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
-     else
-     {
-+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
-+	defined(__FreeBSD__) && defined(IPV6_V6ONLY)
-+		if (domain == PR_AF_INET6) {
-+			int opt = 0;
-+			if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
-+                           &opt, sizeof(opt))) {
-+				close(osfd);
-+				return NULL;
-+			}
-+		}
-+#endif
-         fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
-         if (fd == NULL) close(osfd);
-     }
diff --git a/www/firefox35/pkg-message b/www/firefox35/pkg-message
index f1a5088fdf25..29cb864c176f 100644
--- a/www/firefox35/pkg-message
+++ b/www/firefox35/pkg-message
@@ -1,39 +1,4 @@
 ======================================================================
-0.4_10:
-Backdown with makefile mods left in place.
-
-0.5.20021209:
-Phoenix 0.5 snap on 20021209. Most of the files are PHOENIX_0_5_RELEASE,
-but they didn't tag the browser and toolkit dirs, so those are from this
-AM.
-
-****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 no port ever finds it and it was breaking
-the build.
-
-This version is broken. Backed down to 0.4_10
-
--- AlanE <phoenix@freebsd.org>
-
-0.4_9:
-Install link to java plugin.
-Build plist after install using find/sed.
-
-0.4_8:
-Add patch to fix network ops on -CURRENT.
-
 As of version 0.4_7, this port appears to be stable *again*. It 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.
@@ -59,4 +24,37 @@ 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 Phoenix.
 The Maintainers (alane@ & trevor@)
+
+Additional notes:
+
+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.
+-- AlanE <phoenix@freebsd.org>
+
 ======================================================================
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index 4737767c1d58..87ad5278d832 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@@ -8,11 +8,11 @@
 #
 
 PORTNAME=		phoenix
-PORTVERSION=		0.4
-PORTREVISION=		10
+PORTVERSION=		0.5
+PORTREVISION=		1
 CATEGORIES=		www # pita
-MASTER_SITES=		${MASTER_SITE_LOCAL} # ${BSD_WEBDIR}
-MASTER_SITE_SUBDIR=	trevor
+MASTER_SITES=		${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
+MASTER_SITE_SUBDIR=	alane
 
 MAINTAINER=		phoenix@freebsd.org # alane@fbsd and trevor@fbsd
 
@@ -39,18 +39,12 @@ HAS_CONFIGURE=		yes
 USE_GNOMENG=		yes
 USE_GNOME=		gtk12 orbit
 
-CPPFLAGS+=		-I${X11BASE}/include
-CFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		-L${X11BASE}/lib
-LIBS+=			${PTHREAD_LIBS}
-
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
 LOCAL_SUBDIR=		lib/${PORTNAME}
 LOCAL_PREFIX=		${PREFIX}/${LOCAL_SUBDIR}
 JREDIR=			${LOCALBASE}/jdk1.3.1/jre
-MOZVER=			1.2b
-#MOZVER=		1.3a
+MOZVER=			1.3a
 PLUGINSDIR=		${LOCAL_PREFIX}/lib/mozilla-${MOZVER}/plugins/
 
 .include <bsd.port.pre.mk>
@@ -65,6 +59,21 @@ BROKEN+="please make sure you have issued the command 'use.perl port'"
 SORT?=/usr/bin/sort
 PLIST=${WRKDIR}/plist
 
+.if defined(WITH_DEBUG)
+WITHOUT_OPTIMIZE=	yes
+CONFIGURE_ENV+=		WITH_DEBUG=yes
+.endif # defined(WITH_DEBUG)
+
+.if !defined(WITHOUT_OPTIMIZE)
+CFLAGS+=		-O2
+.endif # defined(WITH_OPTIMIZE)
+
+
+CPPFLAGS+=		-I${X11BASE}/include
+CFLAGS+=		${PTHREAD_CFLAGS}
+LDFLAGS+=		-L${X11BASE}/lib
+LIBS+=			${PTHREAD_LIBS}
+
 pre-extract::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Extracting source (this takes a while) ..."
@@ -130,6 +139,12 @@ cons-plist:
 
 .include <bsd.port.post.mk>
 
-generate-plist: link-bins link-java cleanup-install cons-plist
+# <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: link-bins cleanup-install cons-plist
 
 #EOF
diff --git a/www/firefox36/distinfo b/www/firefox36/distinfo
index f61de58d19c1..4199aae89c1e 100644
--- a/www/firefox36/distinfo
+++ b/www/firefox36/distinfo
@@ -1 +1 @@
-MD5 (phoenix-0.4.tar.bz2) = 4b697330d5fde906b1a6169b80b60102
+MD5 (phoenix-0.5.tar.bz2) = fb99a5a866a99fbb15269699a1022b47
diff --git a/www/firefox36/files/mozconfig.in b/www/firefox36/files/mozconfig.in
index c6beb3bb3703..2bea08b6719a 100644
--- a/www/firefox36/files/mozconfig.in
+++ b/www/firefox36/files/mozconfig.in
@@ -38,7 +38,6 @@ ac_add_options --with-pthreads
 ac_add_options --enable-xft
 ac_add_options --enable-reorder
 ac_add_options --enable-strip
-#ac_add_options --enable-crash-on-assert
 ######################################################################
 # disable unneeded to speed up and/or save space
 ac_add_options --disable-auto-deps
@@ -46,7 +45,12 @@ ac_add_options --disable-bidi
 ac_add_options --disable-dtd-debug
 ac_add_options --disable-jsd
 ac_add_options --disable-ldap
-ac_add_options --disable-logging
 ac_add_options --disable-pedantic
 ac_add_options --disable-xinerama
+if test -n "$WITH_DEBUG"; then
+    ac_add_options --enable-debug
+    ac_add_options --enable-logging
+else
+    ac_add_options --disable-logging
+fi # test -n "$WITH_DEBUG"
 ######################################################################
diff --git a/www/firefox36/files/patch-nsprpub-pr-src-pthrads-ptio.c b/www/firefox36/files/patch-nsprpub-pr-src-pthrads-ptio.c
deleted file mode 100644
index 4a965d4c7440..000000000000
--- a/www/firefox36/files/patch-nsprpub-pr-src-pthrads-ptio.c
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: nsprpub/pr/src/pthreads/ptio.c
-diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c
---- nsprpub/pr/src/pthreads/ptio.c.orig	Fri Apr 12 03:14:39 2002
-+++ nsprpub/pr/src/pthreads/ptio.c	Tue Jul 30 18:52:11 2002
-@@ -3414,6 +3414,17 @@
-     if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
-     else
-     {
-+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
-+	defined(__FreeBSD__) && defined(IPV6_V6ONLY)
-+		if (domain == PR_AF_INET6) {
-+			int opt = 0;
-+			if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
-+                           &opt, sizeof(opt))) {
-+				close(osfd);
-+				return NULL;
-+			}
-+		}
-+#endif
-         fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
-         if (fd == NULL) close(osfd);
-     }
diff --git a/www/firefox36/pkg-message b/www/firefox36/pkg-message
index f1a5088fdf25..29cb864c176f 100644
--- a/www/firefox36/pkg-message
+++ b/www/firefox36/pkg-message
@@ -1,39 +1,4 @@
 ======================================================================
-0.4_10:
-Backdown with makefile mods left in place.
-
-0.5.20021209:
-Phoenix 0.5 snap on 20021209. Most of the files are PHOENIX_0_5_RELEASE,
-but they didn't tag the browser and toolkit dirs, so those are from this
-AM.
-
-****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 no port ever finds it and it was breaking
-the build.
-
-This version is broken. Backed down to 0.4_10
-
--- AlanE <phoenix@freebsd.org>
-
-0.4_9:
-Install link to java plugin.
-Build plist after install using find/sed.
-
-0.4_8:
-Add patch to fix network ops on -CURRENT.
-
 As of version 0.4_7, this port appears to be stable *again*. It 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.
@@ -59,4 +24,37 @@ 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 Phoenix.
 The Maintainers (alane@ & trevor@)
+
+Additional notes:
+
+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.
+-- AlanE <phoenix@freebsd.org>
+
 ======================================================================
diff --git a/www/flock/Makefile b/www/flock/Makefile
index 4737767c1d58..87ad5278d832 100644
--- a/www/flock/Makefile
+++ b/www/flock/Makefile
@@ -8,11 +8,11 @@
 #
 
 PORTNAME=		phoenix
-PORTVERSION=		0.4
-PORTREVISION=		10
+PORTVERSION=		0.5
+PORTREVISION=		1
 CATEGORIES=		www # pita
-MASTER_SITES=		${MASTER_SITE_LOCAL} # ${BSD_WEBDIR}
-MASTER_SITE_SUBDIR=	trevor
+MASTER_SITES=		${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
+MASTER_SITE_SUBDIR=	alane
 
 MAINTAINER=		phoenix@freebsd.org # alane@fbsd and trevor@fbsd
 
@@ -39,18 +39,12 @@ HAS_CONFIGURE=		yes
 USE_GNOMENG=		yes
 USE_GNOME=		gtk12 orbit
 
-CPPFLAGS+=		-I${X11BASE}/include
-CFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		-L${X11BASE}/lib
-LIBS+=			${PTHREAD_LIBS}
-
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
 LOCAL_SUBDIR=		lib/${PORTNAME}
 LOCAL_PREFIX=		${PREFIX}/${LOCAL_SUBDIR}
 JREDIR=			${LOCALBASE}/jdk1.3.1/jre
-MOZVER=			1.2b
-#MOZVER=		1.3a
+MOZVER=			1.3a
 PLUGINSDIR=		${LOCAL_PREFIX}/lib/mozilla-${MOZVER}/plugins/
 
 .include <bsd.port.pre.mk>
@@ -65,6 +59,21 @@ BROKEN+="please make sure you have issued the command 'use.perl port'"
 SORT?=/usr/bin/sort
 PLIST=${WRKDIR}/plist
 
+.if defined(WITH_DEBUG)
+WITHOUT_OPTIMIZE=	yes
+CONFIGURE_ENV+=		WITH_DEBUG=yes
+.endif # defined(WITH_DEBUG)
+
+.if !defined(WITHOUT_OPTIMIZE)
+CFLAGS+=		-O2
+.endif # defined(WITH_OPTIMIZE)
+
+
+CPPFLAGS+=		-I${X11BASE}/include
+CFLAGS+=		${PTHREAD_CFLAGS}
+LDFLAGS+=		-L${X11BASE}/lib
+LIBS+=			${PTHREAD_LIBS}
+
 pre-extract::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Extracting source (this takes a while) ..."
@@ -130,6 +139,12 @@ cons-plist:
 
 .include <bsd.port.post.mk>
 
-generate-plist: link-bins link-java cleanup-install cons-plist
+# <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: link-bins cleanup-install cons-plist
 
 #EOF
diff --git a/www/flock/distinfo b/www/flock/distinfo
index f61de58d19c1..4199aae89c1e 100644
--- a/www/flock/distinfo
+++ b/www/flock/distinfo
@@ -1 +1 @@
-MD5 (phoenix-0.4.tar.bz2) = 4b697330d5fde906b1a6169b80b60102
+MD5 (phoenix-0.5.tar.bz2) = fb99a5a866a99fbb15269699a1022b47
diff --git a/www/flock/files/mozconfig.in b/www/flock/files/mozconfig.in
index c6beb3bb3703..2bea08b6719a 100644
--- a/www/flock/files/mozconfig.in
+++ b/www/flock/files/mozconfig.in
@@ -38,7 +38,6 @@ ac_add_options --with-pthreads
 ac_add_options --enable-xft
 ac_add_options --enable-reorder
 ac_add_options --enable-strip
-#ac_add_options --enable-crash-on-assert
 ######################################################################
 # disable unneeded to speed up and/or save space
 ac_add_options --disable-auto-deps
@@ -46,7 +45,12 @@ ac_add_options --disable-bidi
 ac_add_options --disable-dtd-debug
 ac_add_options --disable-jsd
 ac_add_options --disable-ldap
-ac_add_options --disable-logging
 ac_add_options --disable-pedantic
 ac_add_options --disable-xinerama
+if test -n "$WITH_DEBUG"; then
+    ac_add_options --enable-debug
+    ac_add_options --enable-logging
+else
+    ac_add_options --disable-logging
+fi # test -n "$WITH_DEBUG"
 ######################################################################
diff --git a/www/flock/files/patch-nsprpub-pr-src-pthrads-ptio.c b/www/flock/files/patch-nsprpub-pr-src-pthrads-ptio.c
deleted file mode 100644
index 4a965d4c7440..000000000000
--- a/www/flock/files/patch-nsprpub-pr-src-pthrads-ptio.c
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: nsprpub/pr/src/pthreads/ptio.c
-diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c
---- nsprpub/pr/src/pthreads/ptio.c.orig	Fri Apr 12 03:14:39 2002
-+++ nsprpub/pr/src/pthreads/ptio.c	Tue Jul 30 18:52:11 2002
-@@ -3414,6 +3414,17 @@
-     if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
-     else
-     {
-+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
-+	defined(__FreeBSD__) && defined(IPV6_V6ONLY)
-+		if (domain == PR_AF_INET6) {
-+			int opt = 0;
-+			if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
-+                           &opt, sizeof(opt))) {
-+				close(osfd);
-+				return NULL;
-+			}
-+		}
-+#endif
-         fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
-         if (fd == NULL) close(osfd);
-     }
diff --git a/www/flock/pkg-message b/www/flock/pkg-message
index f1a5088fdf25..29cb864c176f 100644
--- a/www/flock/pkg-message
+++ b/www/flock/pkg-message
@@ -1,39 +1,4 @@
 ======================================================================
-0.4_10:
-Backdown with makefile mods left in place.
-
-0.5.20021209:
-Phoenix 0.5 snap on 20021209. Most of the files are PHOENIX_0_5_RELEASE,
-but they didn't tag the browser and toolkit dirs, so those are from this
-AM.
-
-****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 no port ever finds it and it was breaking
-the build.
-
-This version is broken. Backed down to 0.4_10
-
--- AlanE <phoenix@freebsd.org>
-
-0.4_9:
-Install link to java plugin.
-Build plist after install using find/sed.
-
-0.4_8:
-Add patch to fix network ops on -CURRENT.
-
 As of version 0.4_7, this port appears to be stable *again*. It 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.
@@ -59,4 +24,37 @@ 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 Phoenix.
 The Maintainers (alane@ & trevor@)
+
+Additional notes:
+
+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.
+-- AlanE <phoenix@freebsd.org>
+
 ======================================================================
diff --git a/www/mozilla-firebird/Makefile b/www/mozilla-firebird/Makefile
index 4737767c1d58..87ad5278d832 100644
--- a/www/mozilla-firebird/Makefile
+++ b/www/mozilla-firebird/Makefile
@@ -8,11 +8,11 @@
 #
 
 PORTNAME=		phoenix
-PORTVERSION=		0.4
-PORTREVISION=		10
+PORTVERSION=		0.5
+PORTREVISION=		1
 CATEGORIES=		www # pita
-MASTER_SITES=		${MASTER_SITE_LOCAL} # ${BSD_WEBDIR}
-MASTER_SITE_SUBDIR=	trevor
+MASTER_SITES=		${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
+MASTER_SITE_SUBDIR=	alane
 
 MAINTAINER=		phoenix@freebsd.org # alane@fbsd and trevor@fbsd
 
@@ -39,18 +39,12 @@ HAS_CONFIGURE=		yes
 USE_GNOMENG=		yes
 USE_GNOME=		gtk12 orbit
 
-CPPFLAGS+=		-I${X11BASE}/include
-CFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		-L${X11BASE}/lib
-LIBS+=			${PTHREAD_LIBS}
-
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
 LOCAL_SUBDIR=		lib/${PORTNAME}
 LOCAL_PREFIX=		${PREFIX}/${LOCAL_SUBDIR}
 JREDIR=			${LOCALBASE}/jdk1.3.1/jre
-MOZVER=			1.2b
-#MOZVER=		1.3a
+MOZVER=			1.3a
 PLUGINSDIR=		${LOCAL_PREFIX}/lib/mozilla-${MOZVER}/plugins/
 
 .include <bsd.port.pre.mk>
@@ -65,6 +59,21 @@ BROKEN+="please make sure you have issued the command 'use.perl port'"
 SORT?=/usr/bin/sort
 PLIST=${WRKDIR}/plist
 
+.if defined(WITH_DEBUG)
+WITHOUT_OPTIMIZE=	yes
+CONFIGURE_ENV+=		WITH_DEBUG=yes
+.endif # defined(WITH_DEBUG)
+
+.if !defined(WITHOUT_OPTIMIZE)
+CFLAGS+=		-O2
+.endif # defined(WITH_OPTIMIZE)
+
+
+CPPFLAGS+=		-I${X11BASE}/include
+CFLAGS+=		${PTHREAD_CFLAGS}
+LDFLAGS+=		-L${X11BASE}/lib
+LIBS+=			${PTHREAD_LIBS}
+
 pre-extract::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Extracting source (this takes a while) ..."
@@ -130,6 +139,12 @@ cons-plist:
 
 .include <bsd.port.post.mk>
 
-generate-plist: link-bins link-java cleanup-install cons-plist
+# <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: link-bins cleanup-install cons-plist
 
 #EOF
diff --git a/www/mozilla-firebird/distinfo b/www/mozilla-firebird/distinfo
index f61de58d19c1..4199aae89c1e 100644
--- a/www/mozilla-firebird/distinfo
+++ b/www/mozilla-firebird/distinfo
@@ -1 +1 @@
-MD5 (phoenix-0.4.tar.bz2) = 4b697330d5fde906b1a6169b80b60102
+MD5 (phoenix-0.5.tar.bz2) = fb99a5a866a99fbb15269699a1022b47
diff --git a/www/mozilla-firebird/files/mozconfig.in b/www/mozilla-firebird/files/mozconfig.in
index c6beb3bb3703..2bea08b6719a 100644
--- a/www/mozilla-firebird/files/mozconfig.in
+++ b/www/mozilla-firebird/files/mozconfig.in
@@ -38,7 +38,6 @@ ac_add_options --with-pthreads
 ac_add_options --enable-xft
 ac_add_options --enable-reorder
 ac_add_options --enable-strip
-#ac_add_options --enable-crash-on-assert
 ######################################################################
 # disable unneeded to speed up and/or save space
 ac_add_options --disable-auto-deps
@@ -46,7 +45,12 @@ ac_add_options --disable-bidi
 ac_add_options --disable-dtd-debug
 ac_add_options --disable-jsd
 ac_add_options --disable-ldap
-ac_add_options --disable-logging
 ac_add_options --disable-pedantic
 ac_add_options --disable-xinerama
+if test -n "$WITH_DEBUG"; then
+    ac_add_options --enable-debug
+    ac_add_options --enable-logging
+else
+    ac_add_options --disable-logging
+fi # test -n "$WITH_DEBUG"
 ######################################################################
diff --git a/www/mozilla-firebird/files/patch-nsprpub-pr-src-pthrads-ptio.c b/www/mozilla-firebird/files/patch-nsprpub-pr-src-pthrads-ptio.c
deleted file mode 100644
index 4a965d4c7440..000000000000
--- a/www/mozilla-firebird/files/patch-nsprpub-pr-src-pthrads-ptio.c
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: nsprpub/pr/src/pthreads/ptio.c
-diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c
---- nsprpub/pr/src/pthreads/ptio.c.orig	Fri Apr 12 03:14:39 2002
-+++ nsprpub/pr/src/pthreads/ptio.c	Tue Jul 30 18:52:11 2002
-@@ -3414,6 +3414,17 @@
-     if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
-     else
-     {
-+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
-+	defined(__FreeBSD__) && defined(IPV6_V6ONLY)
-+		if (domain == PR_AF_INET6) {
-+			int opt = 0;
-+			if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
-+                           &opt, sizeof(opt))) {
-+				close(osfd);
-+				return NULL;
-+			}
-+		}
-+#endif
-         fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
-         if (fd == NULL) close(osfd);
-     }
diff --git a/www/mozilla-firebird/pkg-message b/www/mozilla-firebird/pkg-message
index f1a5088fdf25..29cb864c176f 100644
--- a/www/mozilla-firebird/pkg-message
+++ b/www/mozilla-firebird/pkg-message
@@ -1,39 +1,4 @@
 ======================================================================
-0.4_10:
-Backdown with makefile mods left in place.
-
-0.5.20021209:
-Phoenix 0.5 snap on 20021209. Most of the files are PHOENIX_0_5_RELEASE,
-but they didn't tag the browser and toolkit dirs, so those are from this
-AM.
-
-****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 no port ever finds it and it was breaking
-the build.
-
-This version is broken. Backed down to 0.4_10
-
--- AlanE <phoenix@freebsd.org>
-
-0.4_9:
-Install link to java plugin.
-Build plist after install using find/sed.
-
-0.4_8:
-Add patch to fix network ops on -CURRENT.
-
 As of version 0.4_7, this port appears to be stable *again*. It 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.
@@ -59,4 +24,37 @@ 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 Phoenix.
 The Maintainers (alane@ & trevor@)
+
+Additional notes:
+
+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.
+-- AlanE <phoenix@freebsd.org>
+
 ======================================================================
diff --git a/www/phoenix/Makefile b/www/phoenix/Makefile
index 4737767c1d58..87ad5278d832 100644
--- a/www/phoenix/Makefile
+++ b/www/phoenix/Makefile
@@ -8,11 +8,11 @@
 #
 
 PORTNAME=		phoenix
-PORTVERSION=		0.4
-PORTREVISION=		10
+PORTVERSION=		0.5
+PORTREVISION=		1
 CATEGORIES=		www # pita
-MASTER_SITES=		${MASTER_SITE_LOCAL} # ${BSD_WEBDIR}
-MASTER_SITE_SUBDIR=	trevor
+MASTER_SITES=		${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
+MASTER_SITE_SUBDIR=	alane
 
 MAINTAINER=		phoenix@freebsd.org # alane@fbsd and trevor@fbsd
 
@@ -39,18 +39,12 @@ HAS_CONFIGURE=		yes
 USE_GNOMENG=		yes
 USE_GNOME=		gtk12 orbit
 
-CPPFLAGS+=		-I${X11BASE}/include
-CFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		-L${X11BASE}/lib
-LIBS+=			${PTHREAD_LIBS}
-
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
 LOCAL_SUBDIR=		lib/${PORTNAME}
 LOCAL_PREFIX=		${PREFIX}/${LOCAL_SUBDIR}
 JREDIR=			${LOCALBASE}/jdk1.3.1/jre
-MOZVER=			1.2b
-#MOZVER=		1.3a
+MOZVER=			1.3a
 PLUGINSDIR=		${LOCAL_PREFIX}/lib/mozilla-${MOZVER}/plugins/
 
 .include <bsd.port.pre.mk>
@@ -65,6 +59,21 @@ BROKEN+="please make sure you have issued the command 'use.perl port'"
 SORT?=/usr/bin/sort
 PLIST=${WRKDIR}/plist
 
+.if defined(WITH_DEBUG)
+WITHOUT_OPTIMIZE=	yes
+CONFIGURE_ENV+=		WITH_DEBUG=yes
+.endif # defined(WITH_DEBUG)
+
+.if !defined(WITHOUT_OPTIMIZE)
+CFLAGS+=		-O2
+.endif # defined(WITH_OPTIMIZE)
+
+
+CPPFLAGS+=		-I${X11BASE}/include
+CFLAGS+=		${PTHREAD_CFLAGS}
+LDFLAGS+=		-L${X11BASE}/lib
+LIBS+=			${PTHREAD_LIBS}
+
 pre-extract::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Extracting source (this takes a while) ..."
@@ -130,6 +139,12 @@ cons-plist:
 
 .include <bsd.port.post.mk>
 
-generate-plist: link-bins link-java cleanup-install cons-plist
+# <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: link-bins cleanup-install cons-plist
 
 #EOF
diff --git a/www/phoenix/distinfo b/www/phoenix/distinfo
index f61de58d19c1..4199aae89c1e 100644
--- a/www/phoenix/distinfo
+++ b/www/phoenix/distinfo
@@ -1 +1 @@
-MD5 (phoenix-0.4.tar.bz2) = 4b697330d5fde906b1a6169b80b60102
+MD5 (phoenix-0.5.tar.bz2) = fb99a5a866a99fbb15269699a1022b47
diff --git a/www/phoenix/files/mozconfig.in b/www/phoenix/files/mozconfig.in
index c6beb3bb3703..2bea08b6719a 100644
--- a/www/phoenix/files/mozconfig.in
+++ b/www/phoenix/files/mozconfig.in
@@ -38,7 +38,6 @@ ac_add_options --with-pthreads
 ac_add_options --enable-xft
 ac_add_options --enable-reorder
 ac_add_options --enable-strip
-#ac_add_options --enable-crash-on-assert
 ######################################################################
 # disable unneeded to speed up and/or save space
 ac_add_options --disable-auto-deps
@@ -46,7 +45,12 @@ ac_add_options --disable-bidi
 ac_add_options --disable-dtd-debug
 ac_add_options --disable-jsd
 ac_add_options --disable-ldap
-ac_add_options --disable-logging
 ac_add_options --disable-pedantic
 ac_add_options --disable-xinerama
+if test -n "$WITH_DEBUG"; then
+    ac_add_options --enable-debug
+    ac_add_options --enable-logging
+else
+    ac_add_options --disable-logging
+fi # test -n "$WITH_DEBUG"
 ######################################################################
diff --git a/www/phoenix/files/patch-nsprpub-pr-src-pthrads-ptio.c b/www/phoenix/files/patch-nsprpub-pr-src-pthrads-ptio.c
deleted file mode 100644
index 4a965d4c7440..000000000000
--- a/www/phoenix/files/patch-nsprpub-pr-src-pthrads-ptio.c
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: nsprpub/pr/src/pthreads/ptio.c
-diff -u nsprpub/pr/src/pthreads/ptio.c.orig nsprpub/pr/src/pthreads/ptio.c
---- nsprpub/pr/src/pthreads/ptio.c.orig	Fri Apr 12 03:14:39 2002
-+++ nsprpub/pr/src/pthreads/ptio.c	Tue Jul 30 18:52:11 2002
-@@ -3414,6 +3414,17 @@
-     if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno);
-     else
-     {
-+#if (defined(_PR_INET6_PROBE) || defined(_PR_INET6)) && \
-+	defined(__FreeBSD__) && defined(IPV6_V6ONLY)
-+		if (domain == PR_AF_INET6) {
-+			int opt = 0;
-+			if (setsockopt(osfd, IPPROTO_IPV6, IPV6_V6ONLY,
-+                           &opt, sizeof(opt))) {
-+				close(osfd);
-+				return NULL;
-+			}
-+		}
-+#endif
-         fd = pt_SetMethods(osfd, ftype, PR_FALSE, PR_FALSE);
-         if (fd == NULL) close(osfd);
-     }
diff --git a/www/phoenix/pkg-message b/www/phoenix/pkg-message
index f1a5088fdf25..29cb864c176f 100644
--- a/www/phoenix/pkg-message
+++ b/www/phoenix/pkg-message
@@ -1,39 +1,4 @@
 ======================================================================
-0.4_10:
-Backdown with makefile mods left in place.
-
-0.5.20021209:
-Phoenix 0.5 snap on 20021209. Most of the files are PHOENIX_0_5_RELEASE,
-but they didn't tag the browser and toolkit dirs, so those are from this
-AM.
-
-****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 no port ever finds it and it was breaking
-the build.
-
-This version is broken. Backed down to 0.4_10
-
--- AlanE <phoenix@freebsd.org>
-
-0.4_9:
-Install link to java plugin.
-Build plist after install using find/sed.
-
-0.4_8:
-Add patch to fix network ops on -CURRENT.
-
 As of version 0.4_7, this port appears to be stable *again*. It 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.
@@ -59,4 +24,37 @@ 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 Phoenix.
 The Maintainers (alane@ & trevor@)
+
+Additional notes:
+
+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.
+-- AlanE <phoenix@freebsd.org>
+
 ======================================================================