This is a TEST version - if it works I'll force a Makefile commit

stating otherwise. I'm trying to get the perl version and File::Spec(imen)
problems ironed out.

Please try this with whatever version of perl you are using and report
back to phoenix@geeksrus.net. Thank you. Don't forget to tell us if you
are doing "use.perl port" or "use.perl system" if you have one of the
ports.

-- AlanE, who's ready to propose a virtual category called "pita".

24 files changed, 216 insertions, 120 deletions

diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile
index 4cd0365ccd8d..7844aafe9da9 100644
--- a/www/firefox-devel/Makefile
+++ b/www/firefox-devel/Makefile
@@ -9,8 +9,8 @@
 
 PORTNAME=		phoenix
 PORTVERSION=		0.4
-PORTREVISION=		2
-CATEGORIES=		www
+PORTREVISION=		3
+CATEGORIES=		www # pita
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
 
@@ -40,25 +40,32 @@ USE_GNOME=		gtk12 orbit
 
 CFLAGS+=		${PTHREAD_CFLAGS}
 LIBS+=			${PTHREAD_LIBS}
-.if defined(OPTIMIZE)
-CFLAGS+=		-O2
-.endif # defined(OPTIMIZE)
 
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
 LOCAL_PREFIX=		${PREFIX}/lib/${PORTNAME}
+MAKE_FLAGS+=		-DXP_UNIX
 
 .include <bsd.port.pre.mk>
 
-SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+perl_major=${PERL_VERSION:C|^([1-9]+).*|\1|}
+_perl_minor=00${PERL_VERSION:C|^([1-9]+)\.([0-9]+).*|\2|}
+perl_minor=${_perl_minor:C|^.*(...)|\1|}
+.if ${perl_minor} >= 100
+perl_minor=${PERL_VERSION:C|^([1-9]+)\.([0-9][0-9][0-9]).*|\2|}
+perl_patch=${PERL_VERSION:C|^.*(..)|\1|}
+.else # ${perl_minor} < 100
+_perl_patch=0${PERL_VERSION:C|^([1-9]+)\.([0-9]+)\.*|0|}
+perl_patch=${_perl_patch:C|^.*(..)|\1|}
+.endif # ${perl_minor} < 100
+PERL_LEVEL=${perl_major}${perl_minor}${perl_patch}
 
-PERL_MAJOR=${PERL_VER:C|^([1-9]+).*|\1|}
-PERL_MINOR=${PERL_VER:C|^[1-9]+\.0*([1-9]+).*|\1|}
+SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 
-.if ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+.if ${PERL_LEVEL} < 500601
 RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
 BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif # ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+.endif # ${PERL_LEVEL} < 500601
 
 .if ${OSVERSION} > 500038
 BROKEN=	"on -CURRENT, can only be used with local files"
diff --git a/www/firefox-devel/files/mozconfig.in b/www/firefox-devel/files/mozconfig.in
index 8468f9514a85..c28769721c04 100644
--- a/www/firefox-devel/files/mozconfig.in
+++ b/www/firefox-devel/files/mozconfig.in
@@ -14,6 +14,7 @@ ac_add_options --disable-composer
 export CFLAGS="@CFLAGS@"
 export LIBS="@LIBS@"
 export CONFIG_SH=/bin/sh
+export XP_UNIX=1
 test -x /usr/bin/perl && export PERL=/usr/bin/perl \
     || export PERL=/usr/local/bin/perl
 mk_add_options PERL=$PERL
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 4cd0365ccd8d..7844aafe9da9 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -9,8 +9,8 @@
 
 PORTNAME=		phoenix
 PORTVERSION=		0.4
-PORTREVISION=		2
-CATEGORIES=		www
+PORTREVISION=		3
+CATEGORIES=		www # pita
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
 
@@ -40,25 +40,32 @@ USE_GNOME=		gtk12 orbit
 
 CFLAGS+=		${PTHREAD_CFLAGS}
 LIBS+=			${PTHREAD_LIBS}
-.if defined(OPTIMIZE)
-CFLAGS+=		-O2
-.endif # defined(OPTIMIZE)
 
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
 LOCAL_PREFIX=		${PREFIX}/lib/${PORTNAME}
+MAKE_FLAGS+=		-DXP_UNIX
 
 .include <bsd.port.pre.mk>
 
-SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+perl_major=${PERL_VERSION:C|^([1-9]+).*|\1|}
+_perl_minor=00${PERL_VERSION:C|^([1-9]+)\.([0-9]+).*|\2|}
+perl_minor=${_perl_minor:C|^.*(...)|\1|}
+.if ${perl_minor} >= 100
+perl_minor=${PERL_VERSION:C|^([1-9]+)\.([0-9][0-9][0-9]).*|\2|}
+perl_patch=${PERL_VERSION:C|^.*(..)|\1|}
+.else # ${perl_minor} < 100
+_perl_patch=0${PERL_VERSION:C|^([1-9]+)\.([0-9]+)\.*|0|}
+perl_patch=${_perl_patch:C|^.*(..)|\1|}
+.endif # ${perl_minor} < 100
+PERL_LEVEL=${perl_major}${perl_minor}${perl_patch}
 
-PERL_MAJOR=${PERL_VER:C|^([1-9]+).*|\1|}
-PERL_MINOR=${PERL_VER:C|^[1-9]+\.0*([1-9]+).*|\1|}
+SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 
-.if ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+.if ${PERL_LEVEL} < 500601
 RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
 BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif # ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+.endif # ${PERL_LEVEL} < 500601
 
 .if ${OSVERSION} > 500038
 BROKEN=	"on -CURRENT, can only be used with local files"
diff --git a/www/firefox-esr/files/mozconfig.in b/www/firefox-esr/files/mozconfig.in
index 8468f9514a85..c28769721c04 100644
--- a/www/firefox-esr/files/mozconfig.in
+++ b/www/firefox-esr/files/mozconfig.in
@@ -14,6 +14,7 @@ ac_add_options --disable-composer
 export CFLAGS="@CFLAGS@"
 export LIBS="@LIBS@"
 export CONFIG_SH=/bin/sh
+export XP_UNIX=1
 test -x /usr/bin/perl && export PERL=/usr/bin/perl \
     || export PERL=/usr/local/bin/perl
 mk_add_options PERL=$PERL
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 4cd0365ccd8d..7844aafe9da9 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -9,8 +9,8 @@
 
 PORTNAME=		phoenix
 PORTVERSION=		0.4
-PORTREVISION=		2
-CATEGORIES=		www
+PORTREVISION=		3
+CATEGORIES=		www # pita
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
 
@@ -40,25 +40,32 @@ USE_GNOME=		gtk12 orbit
 
 CFLAGS+=		${PTHREAD_CFLAGS}
 LIBS+=			${PTHREAD_LIBS}
-.if defined(OPTIMIZE)
-CFLAGS+=		-O2
-.endif # defined(OPTIMIZE)
 
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
 LOCAL_PREFIX=		${PREFIX}/lib/${PORTNAME}
+MAKE_FLAGS+=		-DXP_UNIX
 
 .include <bsd.port.pre.mk>
 
-SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+perl_major=${PERL_VERSION:C|^([1-9]+).*|\1|}
+_perl_minor=00${PERL_VERSION:C|^([1-9]+)\.([0-9]+).*|\2|}
+perl_minor=${_perl_minor:C|^.*(...)|\1|}
+.if ${perl_minor} >= 100
+perl_minor=${PERL_VERSION:C|^([1-9]+)\.([0-9][0-9][0-9]).*|\2|}
+perl_patch=${PERL_VERSION:C|^.*(..)|\1|}
+.else # ${perl_minor} < 100
+_perl_patch=0${PERL_VERSION:C|^([1-9]+)\.([0-9]+)\.*|0|}
+perl_patch=${_perl_patch:C|^.*(..)|\1|}
+.endif # ${perl_minor} < 100
+PERL_LEVEL=${perl_major}${perl_minor}${perl_patch}
 
-PERL_MAJOR=${PERL_VER:C|^([1-9]+).*|\1|}
-PERL_MINOR=${PERL_VER:C|^[1-9]+\.0*([1-9]+).*|\1|}
+SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 
-.if ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+.if ${PERL_LEVEL} < 500601
 RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
 BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif # ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+.endif # ${PERL_LEVEL} < 500601
 
 .if ${OSVERSION} > 500038
 BROKEN=	"on -CURRENT, can only be used with local files"
diff --git a/www/firefox/files/mozconfig.in b/www/firefox/files/mozconfig.in
index 8468f9514a85..c28769721c04 100644
--- a/www/firefox/files/mozconfig.in
+++ b/www/firefox/files/mozconfig.in
@@ -14,6 +14,7 @@ ac_add_options --disable-composer
 export CFLAGS="@CFLAGS@"
 export LIBS="@LIBS@"
 export CONFIG_SH=/bin/sh
+export XP_UNIX=1
 test -x /usr/bin/perl && export PERL=/usr/bin/perl \
     || export PERL=/usr/local/bin/perl
 mk_add_options PERL=$PERL
diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile
index 4cd0365ccd8d..7844aafe9da9 100644
--- a/www/firefox10/Makefile
+++ b/www/firefox10/Makefile
@@ -9,8 +9,8 @@
 
 PORTNAME=		phoenix
 PORTVERSION=		0.4
-PORTREVISION=		2
-CATEGORIES=		www
+PORTREVISION=		3
+CATEGORIES=		www # pita
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
 
@@ -40,25 +40,32 @@ USE_GNOME=		gtk12 orbit
 
 CFLAGS+=		${PTHREAD_CFLAGS}
 LIBS+=			${PTHREAD_LIBS}
-.if defined(OPTIMIZE)
-CFLAGS+=		-O2
-.endif # defined(OPTIMIZE)
 
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
 LOCAL_PREFIX=		${PREFIX}/lib/${PORTNAME}
+MAKE_FLAGS+=		-DXP_UNIX
 
 .include <bsd.port.pre.mk>
 
-SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+perl_major=${PERL_VERSION:C|^([1-9]+).*|\1|}
+_perl_minor=00${PERL_VERSION:C|^([1-9]+)\.([0-9]+).*|\2|}
+perl_minor=${_perl_minor:C|^.*(...)|\1|}
+.if ${perl_minor} >= 100
+perl_minor=${PERL_VERSION:C|^([1-9]+)\.([0-9][0-9][0-9]).*|\2|}
+perl_patch=${PERL_VERSION:C|^.*(..)|\1|}
+.else # ${perl_minor} < 100
+_perl_patch=0${PERL_VERSION:C|^([1-9]+)\.([0-9]+)\.*|0|}
+perl_patch=${_perl_patch:C|^.*(..)|\1|}
+.endif # ${perl_minor} < 100
+PERL_LEVEL=${perl_major}${perl_minor}${perl_patch}
 
-PERL_MAJOR=${PERL_VER:C|^([1-9]+).*|\1|}
-PERL_MINOR=${PERL_VER:C|^[1-9]+\.0*([1-9]+).*|\1|}
+SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 
-.if ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+.if ${PERL_LEVEL} < 500601
 RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
 BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif # ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+.endif # ${PERL_LEVEL} < 500601
 
 .if ${OSVERSION} > 500038
 BROKEN=	"on -CURRENT, can only be used with local files"
diff --git a/www/firefox10/files/mozconfig.in b/www/firefox10/files/mozconfig.in
index 8468f9514a85..c28769721c04 100644
--- a/www/firefox10/files/mozconfig.in
+++ b/www/firefox10/files/mozconfig.in
@@ -14,6 +14,7 @@ ac_add_options --disable-composer
 export CFLAGS="@CFLAGS@"
 export LIBS="@LIBS@"
 export CONFIG_SH=/bin/sh
+export XP_UNIX=1
 test -x /usr/bin/perl && export PERL=/usr/bin/perl \
     || export PERL=/usr/local/bin/perl
 mk_add_options PERL=$PERL
diff --git a/www/firefox15/Makefile b/www/firefox15/Makefile
index 4cd0365ccd8d..7844aafe9da9 100644
--- a/www/firefox15/Makefile
+++ b/www/firefox15/Makefile
@@ -9,8 +9,8 @@
 
 PORTNAME=		phoenix
 PORTVERSION=		0.4
-PORTREVISION=		2
-CATEGORIES=		www
+PORTREVISION=		3
+CATEGORIES=		www # pita
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
 
@@ -40,25 +40,32 @@ USE_GNOME=		gtk12 orbit
 
 CFLAGS+=		${PTHREAD_CFLAGS}
 LIBS+=			${PTHREAD_LIBS}
-.if defined(OPTIMIZE)
-CFLAGS+=		-O2
-.endif # defined(OPTIMIZE)
 
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
 LOCAL_PREFIX=		${PREFIX}/lib/${PORTNAME}
+MAKE_FLAGS+=		-DXP_UNIX
 
 .include <bsd.port.pre.mk>
 
-SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+perl_major=${PERL_VERSION:C|^([1-9]+).*|\1|}
+_perl_minor=00${PERL_VERSION:C|^([1-9]+)\.([0-9]+).*|\2|}
+perl_minor=${_perl_minor:C|^.*(...)|\1|}
+.if ${perl_minor} >= 100
+perl_minor=${PERL_VERSION:C|^([1-9]+)\.([0-9][0-9][0-9]).*|\2|}
+perl_patch=${PERL_VERSION:C|^.*(..)|\1|}
+.else # ${perl_minor} < 100
+_perl_patch=0${PERL_VERSION:C|^([1-9]+)\.([0-9]+)\.*|0|}
+perl_patch=${_perl_patch:C|^.*(..)|\1|}
+.endif # ${perl_minor} < 100
+PERL_LEVEL=${perl_major}${perl_minor}${perl_patch}
 
-PERL_MAJOR=${PERL_VER:C|^([1-9]+).*|\1|}
-PERL_MINOR=${PERL_VER:C|^[1-9]+\.0*([1-9]+).*|\1|}
+SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 
-.if ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+.if ${PERL_LEVEL} < 500601
 RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
 BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif # ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+.endif # ${PERL_LEVEL} < 500601
 
 .if ${OSVERSION} > 500038
 BROKEN=	"on -CURRENT, can only be used with local files"
diff --git a/www/firefox15/files/mozconfig.in b/www/firefox15/files/mozconfig.in
index 8468f9514a85..c28769721c04 100644
--- a/www/firefox15/files/mozconfig.in
+++ b/www/firefox15/files/mozconfig.in
@@ -14,6 +14,7 @@ ac_add_options --disable-composer
 export CFLAGS="@CFLAGS@"
 export LIBS="@LIBS@"
 export CONFIG_SH=/bin/sh
+export XP_UNIX=1
 test -x /usr/bin/perl && export PERL=/usr/bin/perl \
     || export PERL=/usr/local/bin/perl
 mk_add_options PERL=$PERL
diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile
index 4cd0365ccd8d..7844aafe9da9 100644
--- a/www/firefox3-devel/Makefile
+++ b/www/firefox3-devel/Makefile
@@ -9,8 +9,8 @@
 
 PORTNAME=		phoenix
 PORTVERSION=		0.4
-PORTREVISION=		2
-CATEGORIES=		www
+PORTREVISION=		3
+CATEGORIES=		www # pita
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
 
@@ -40,25 +40,32 @@ USE_GNOME=		gtk12 orbit
 
 CFLAGS+=		${PTHREAD_CFLAGS}
 LIBS+=			${PTHREAD_LIBS}
-.if defined(OPTIMIZE)
-CFLAGS+=		-O2
-.endif # defined(OPTIMIZE)
 
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
 LOCAL_PREFIX=		${PREFIX}/lib/${PORTNAME}
+MAKE_FLAGS+=		-DXP_UNIX
 
 .include <bsd.port.pre.mk>
 
-SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+perl_major=${PERL_VERSION:C|^([1-9]+).*|\1|}
+_perl_minor=00${PERL_VERSION:C|^([1-9]+)\.([0-9]+).*|\2|}
+perl_minor=${_perl_minor:C|^.*(...)|\1|}
+.if ${perl_minor} >= 100
+perl_minor=${PERL_VERSION:C|^([1-9]+)\.([0-9][0-9][0-9]).*|\2|}
+perl_patch=${PERL_VERSION:C|^.*(..)|\1|}
+.else # ${perl_minor} < 100
+_perl_patch=0${PERL_VERSION:C|^([1-9]+)\.([0-9]+)\.*|0|}
+perl_patch=${_perl_patch:C|^.*(..)|\1|}
+.endif # ${perl_minor} < 100
+PERL_LEVEL=${perl_major}${perl_minor}${perl_patch}
 
-PERL_MAJOR=${PERL_VER:C|^([1-9]+).*|\1|}
-PERL_MINOR=${PERL_VER:C|^[1-9]+\.0*([1-9]+).*|\1|}
+SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 
-.if ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+.if ${PERL_LEVEL} < 500601
 RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
 BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif # ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+.endif # ${PERL_LEVEL} < 500601
 
 .if ${OSVERSION} > 500038
 BROKEN=	"on -CURRENT, can only be used with local files"
diff --git a/www/firefox3-devel/files/mozconfig.in b/www/firefox3-devel/files/mozconfig.in
index 8468f9514a85..c28769721c04 100644
--- a/www/firefox3-devel/files/mozconfig.in
+++ b/www/firefox3-devel/files/mozconfig.in
@@ -14,6 +14,7 @@ ac_add_options --disable-composer
 export CFLAGS="@CFLAGS@"
 export LIBS="@LIBS@"
 export CONFIG_SH=/bin/sh
+export XP_UNIX=1
 test -x /usr/bin/perl && export PERL=/usr/bin/perl \
     || export PERL=/usr/local/bin/perl
 mk_add_options PERL=$PERL
diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile
index 4cd0365ccd8d..7844aafe9da9 100644
--- a/www/firefox35/Makefile
+++ b/www/firefox35/Makefile
@@ -9,8 +9,8 @@
 
 PORTNAME=		phoenix
 PORTVERSION=		0.4
-PORTREVISION=		2
-CATEGORIES=		www
+PORTREVISION=		3
+CATEGORIES=		www # pita
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
 
@@ -40,25 +40,32 @@ USE_GNOME=		gtk12 orbit
 
 CFLAGS+=		${PTHREAD_CFLAGS}
 LIBS+=			${PTHREAD_LIBS}
-.if defined(OPTIMIZE)
-CFLAGS+=		-O2
-.endif # defined(OPTIMIZE)
 
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
 LOCAL_PREFIX=		${PREFIX}/lib/${PORTNAME}
+MAKE_FLAGS+=		-DXP_UNIX
 
 .include <bsd.port.pre.mk>
 
-SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+perl_major=${PERL_VERSION:C|^([1-9]+).*|\1|}
+_perl_minor=00${PERL_VERSION:C|^([1-9]+)\.([0-9]+).*|\2|}
+perl_minor=${_perl_minor:C|^.*(...)|\1|}
+.if ${perl_minor} >= 100
+perl_minor=${PERL_VERSION:C|^([1-9]+)\.([0-9][0-9][0-9]).*|\2|}
+perl_patch=${PERL_VERSION:C|^.*(..)|\1|}
+.else # ${perl_minor} < 100
+_perl_patch=0${PERL_VERSION:C|^([1-9]+)\.([0-9]+)\.*|0|}
+perl_patch=${_perl_patch:C|^.*(..)|\1|}
+.endif # ${perl_minor} < 100
+PERL_LEVEL=${perl_major}${perl_minor}${perl_patch}
 
-PERL_MAJOR=${PERL_VER:C|^([1-9]+).*|\1|}
-PERL_MINOR=${PERL_VER:C|^[1-9]+\.0*([1-9]+).*|\1|}
+SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 
-.if ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+.if ${PERL_LEVEL} < 500601
 RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
 BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif # ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+.endif # ${PERL_LEVEL} < 500601
 
 .if ${OSVERSION} > 500038
 BROKEN=	"on -CURRENT, can only be used with local files"
diff --git a/www/firefox35/files/mozconfig.in b/www/firefox35/files/mozconfig.in
index 8468f9514a85..c28769721c04 100644
--- a/www/firefox35/files/mozconfig.in
+++ b/www/firefox35/files/mozconfig.in
@@ -14,6 +14,7 @@ ac_add_options --disable-composer
 export CFLAGS="@CFLAGS@"
 export LIBS="@LIBS@"
 export CONFIG_SH=/bin/sh
+export XP_UNIX=1
 test -x /usr/bin/perl && export PERL=/usr/bin/perl \
     || export PERL=/usr/local/bin/perl
 mk_add_options PERL=$PERL
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index 4cd0365ccd8d..7844aafe9da9 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@@ -9,8 +9,8 @@
 
 PORTNAME=		phoenix
 PORTVERSION=		0.4
-PORTREVISION=		2
-CATEGORIES=		www
+PORTREVISION=		3
+CATEGORIES=		www # pita
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
 
@@ -40,25 +40,32 @@ USE_GNOME=		gtk12 orbit
 
 CFLAGS+=		${PTHREAD_CFLAGS}
 LIBS+=			${PTHREAD_LIBS}
-.if defined(OPTIMIZE)
-CFLAGS+=		-O2
-.endif # defined(OPTIMIZE)
 
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
 LOCAL_PREFIX=		${PREFIX}/lib/${PORTNAME}
+MAKE_FLAGS+=		-DXP_UNIX
 
 .include <bsd.port.pre.mk>
 
-SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+perl_major=${PERL_VERSION:C|^([1-9]+).*|\1|}
+_perl_minor=00${PERL_VERSION:C|^([1-9]+)\.([0-9]+).*|\2|}
+perl_minor=${_perl_minor:C|^.*(...)|\1|}
+.if ${perl_minor} >= 100
+perl_minor=${PERL_VERSION:C|^([1-9]+)\.([0-9][0-9][0-9]).*|\2|}
+perl_patch=${PERL_VERSION:C|^.*(..)|\1|}
+.else # ${perl_minor} < 100
+_perl_patch=0${PERL_VERSION:C|^([1-9]+)\.([0-9]+)\.*|0|}
+perl_patch=${_perl_patch:C|^.*(..)|\1|}
+.endif # ${perl_minor} < 100
+PERL_LEVEL=${perl_major}${perl_minor}${perl_patch}
 
-PERL_MAJOR=${PERL_VER:C|^([1-9]+).*|\1|}
-PERL_MINOR=${PERL_VER:C|^[1-9]+\.0*([1-9]+).*|\1|}
+SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 
-.if ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+.if ${PERL_LEVEL} < 500601
 RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
 BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif # ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+.endif # ${PERL_LEVEL} < 500601
 
 .if ${OSVERSION} > 500038
 BROKEN=	"on -CURRENT, can only be used with local files"
diff --git a/www/firefox36/files/mozconfig.in b/www/firefox36/files/mozconfig.in
index 8468f9514a85..c28769721c04 100644
--- a/www/firefox36/files/mozconfig.in
+++ b/www/firefox36/files/mozconfig.in
@@ -14,6 +14,7 @@ ac_add_options --disable-composer
 export CFLAGS="@CFLAGS@"
 export LIBS="@LIBS@"
 export CONFIG_SH=/bin/sh
+export XP_UNIX=1
 test -x /usr/bin/perl && export PERL=/usr/bin/perl \
     || export PERL=/usr/local/bin/perl
 mk_add_options PERL=$PERL
diff --git a/www/flock/Makefile b/www/flock/Makefile
index 4cd0365ccd8d..7844aafe9da9 100644
--- a/www/flock/Makefile
+++ b/www/flock/Makefile
@@ -9,8 +9,8 @@
 
 PORTNAME=		phoenix
 PORTVERSION=		0.4
-PORTREVISION=		2
-CATEGORIES=		www
+PORTREVISION=		3
+CATEGORIES=		www # pita
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
 
@@ -40,25 +40,32 @@ USE_GNOME=		gtk12 orbit
 
 CFLAGS+=		${PTHREAD_CFLAGS}
 LIBS+=			${PTHREAD_LIBS}
-.if defined(OPTIMIZE)
-CFLAGS+=		-O2
-.endif # defined(OPTIMIZE)
 
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
 LOCAL_PREFIX=		${PREFIX}/lib/${PORTNAME}
+MAKE_FLAGS+=		-DXP_UNIX
 
 .include <bsd.port.pre.mk>
 
-SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+perl_major=${PERL_VERSION:C|^([1-9]+).*|\1|}
+_perl_minor=00${PERL_VERSION:C|^([1-9]+)\.([0-9]+).*|\2|}
+perl_minor=${_perl_minor:C|^.*(...)|\1|}
+.if ${perl_minor} >= 100
+perl_minor=${PERL_VERSION:C|^([1-9]+)\.([0-9][0-9][0-9]).*|\2|}
+perl_patch=${PERL_VERSION:C|^.*(..)|\1|}
+.else # ${perl_minor} < 100
+_perl_patch=0${PERL_VERSION:C|^([1-9]+)\.([0-9]+)\.*|0|}
+perl_patch=${_perl_patch:C|^.*(..)|\1|}
+.endif # ${perl_minor} < 100
+PERL_LEVEL=${perl_major}${perl_minor}${perl_patch}
 
-PERL_MAJOR=${PERL_VER:C|^([1-9]+).*|\1|}
-PERL_MINOR=${PERL_VER:C|^[1-9]+\.0*([1-9]+).*|\1|}
+SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 
-.if ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+.if ${PERL_LEVEL} < 500601
 RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
 BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif # ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+.endif # ${PERL_LEVEL} < 500601
 
 .if ${OSVERSION} > 500038
 BROKEN=	"on -CURRENT, can only be used with local files"
diff --git a/www/flock/files/mozconfig.in b/www/flock/files/mozconfig.in
index 8468f9514a85..c28769721c04 100644
--- a/www/flock/files/mozconfig.in
+++ b/www/flock/files/mozconfig.in
@@ -14,6 +14,7 @@ ac_add_options --disable-composer
 export CFLAGS="@CFLAGS@"
 export LIBS="@LIBS@"
 export CONFIG_SH=/bin/sh
+export XP_UNIX=1
 test -x /usr/bin/perl && export PERL=/usr/bin/perl \
     || export PERL=/usr/local/bin/perl
 mk_add_options PERL=$PERL
diff --git a/www/mozilla-firebird/Makefile b/www/mozilla-firebird/Makefile
index 4cd0365ccd8d..7844aafe9da9 100644
--- a/www/mozilla-firebird/Makefile
+++ b/www/mozilla-firebird/Makefile
@@ -9,8 +9,8 @@
 
 PORTNAME=		phoenix
 PORTVERSION=		0.4
-PORTREVISION=		2
-CATEGORIES=		www
+PORTREVISION=		3
+CATEGORIES=		www # pita
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
 
@@ -40,25 +40,32 @@ USE_GNOME=		gtk12 orbit
 
 CFLAGS+=		${PTHREAD_CFLAGS}
 LIBS+=			${PTHREAD_LIBS}
-.if defined(OPTIMIZE)
-CFLAGS+=		-O2
-.endif # defined(OPTIMIZE)
 
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
 LOCAL_PREFIX=		${PREFIX}/lib/${PORTNAME}
+MAKE_FLAGS+=		-DXP_UNIX
 
 .include <bsd.port.pre.mk>
 
-SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+perl_major=${PERL_VERSION:C|^([1-9]+).*|\1|}
+_perl_minor=00${PERL_VERSION:C|^([1-9]+)\.([0-9]+).*|\2|}
+perl_minor=${_perl_minor:C|^.*(...)|\1|}
+.if ${perl_minor} >= 100
+perl_minor=${PERL_VERSION:C|^([1-9]+)\.([0-9][0-9][0-9]).*|\2|}
+perl_patch=${PERL_VERSION:C|^.*(..)|\1|}
+.else # ${perl_minor} < 100
+_perl_patch=0${PERL_VERSION:C|^([1-9]+)\.([0-9]+)\.*|0|}
+perl_patch=${_perl_patch:C|^.*(..)|\1|}
+.endif # ${perl_minor} < 100
+PERL_LEVEL=${perl_major}${perl_minor}${perl_patch}
 
-PERL_MAJOR=${PERL_VER:C|^([1-9]+).*|\1|}
-PERL_MINOR=${PERL_VER:C|^[1-9]+\.0*([1-9]+).*|\1|}
+SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 
-.if ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+.if ${PERL_LEVEL} < 500601
 RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
 BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif # ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+.endif # ${PERL_LEVEL} < 500601
 
 .if ${OSVERSION} > 500038
 BROKEN=	"on -CURRENT, can only be used with local files"
diff --git a/www/mozilla-firebird/files/mozconfig.in b/www/mozilla-firebird/files/mozconfig.in
index 8468f9514a85..c28769721c04 100644
--- a/www/mozilla-firebird/files/mozconfig.in
+++ b/www/mozilla-firebird/files/mozconfig.in
@@ -14,6 +14,7 @@ ac_add_options --disable-composer
 export CFLAGS="@CFLAGS@"
 export LIBS="@LIBS@"
 export CONFIG_SH=/bin/sh
+export XP_UNIX=1
 test -x /usr/bin/perl && export PERL=/usr/bin/perl \
     || export PERL=/usr/local/bin/perl
 mk_add_options PERL=$PERL
diff --git a/www/phoenix-devel/Makefile b/www/phoenix-devel/Makefile
index 4cd0365ccd8d..7844aafe9da9 100644
--- a/www/phoenix-devel/Makefile
+++ b/www/phoenix-devel/Makefile
@@ -9,8 +9,8 @@
 
 PORTNAME=		phoenix
 PORTVERSION=		0.4
-PORTREVISION=		2
-CATEGORIES=		www
+PORTREVISION=		3
+CATEGORIES=		www # pita
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
 
@@ -40,25 +40,32 @@ USE_GNOME=		gtk12 orbit
 
 CFLAGS+=		${PTHREAD_CFLAGS}
 LIBS+=			${PTHREAD_LIBS}
-.if defined(OPTIMIZE)
-CFLAGS+=		-O2
-.endif # defined(OPTIMIZE)
 
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
 LOCAL_PREFIX=		${PREFIX}/lib/${PORTNAME}
+MAKE_FLAGS+=		-DXP_UNIX
 
 .include <bsd.port.pre.mk>
 
-SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+perl_major=${PERL_VERSION:C|^([1-9]+).*|\1|}
+_perl_minor=00${PERL_VERSION:C|^([1-9]+)\.([0-9]+).*|\2|}
+perl_minor=${_perl_minor:C|^.*(...)|\1|}
+.if ${perl_minor} >= 100
+perl_minor=${PERL_VERSION:C|^([1-9]+)\.([0-9][0-9][0-9]).*|\2|}
+perl_patch=${PERL_VERSION:C|^.*(..)|\1|}
+.else # ${perl_minor} < 100
+_perl_patch=0${PERL_VERSION:C|^([1-9]+)\.([0-9]+)\.*|0|}
+perl_patch=${_perl_patch:C|^.*(..)|\1|}
+.endif # ${perl_minor} < 100
+PERL_LEVEL=${perl_major}${perl_minor}${perl_patch}
 
-PERL_MAJOR=${PERL_VER:C|^([1-9]+).*|\1|}
-PERL_MINOR=${PERL_VER:C|^[1-9]+\.0*([1-9]+).*|\1|}
+SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 
-.if ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+.if ${PERL_LEVEL} < 500601
 RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
 BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif # ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+.endif # ${PERL_LEVEL} < 500601
 
 .if ${OSVERSION} > 500038
 BROKEN=	"on -CURRENT, can only be used with local files"
diff --git a/www/phoenix-devel/files/mozconfig.in b/www/phoenix-devel/files/mozconfig.in
index 8468f9514a85..c28769721c04 100644
--- a/www/phoenix-devel/files/mozconfig.in
+++ b/www/phoenix-devel/files/mozconfig.in
@@ -14,6 +14,7 @@ ac_add_options --disable-composer
 export CFLAGS="@CFLAGS@"
 export LIBS="@LIBS@"
 export CONFIG_SH=/bin/sh
+export XP_UNIX=1
 test -x /usr/bin/perl && export PERL=/usr/bin/perl \
     || export PERL=/usr/local/bin/perl
 mk_add_options PERL=$PERL
diff --git a/www/phoenix/Makefile b/www/phoenix/Makefile
index 4cd0365ccd8d..7844aafe9da9 100644
--- a/www/phoenix/Makefile
+++ b/www/phoenix/Makefile
@@ -9,8 +9,8 @@
 
 PORTNAME=		phoenix
 PORTVERSION=		0.4
-PORTREVISION=		2
-CATEGORIES=		www
+PORTREVISION=		3
+CATEGORIES=		www # pita
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
 
@@ -40,25 +40,32 @@ USE_GNOME=		gtk12 orbit
 
 CFLAGS+=		${PTHREAD_CFLAGS}
 LIBS+=			${PTHREAD_LIBS}
-.if defined(OPTIMIZE)
-CFLAGS+=		-O2
-.endif # defined(OPTIMIZE)
 
 NO_MTREE=		yes
 WRKSRC=			${WRKDIR}/mozilla
 LOCAL_PREFIX=		${PREFIX}/lib/${PORTNAME}
+MAKE_FLAGS+=		-DXP_UNIX
 
 .include <bsd.port.pre.mk>
 
-SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+perl_major=${PERL_VERSION:C|^([1-9]+).*|\1|}
+_perl_minor=00${PERL_VERSION:C|^([1-9]+)\.([0-9]+).*|\2|}
+perl_minor=${_perl_minor:C|^.*(...)|\1|}
+.if ${perl_minor} >= 100
+perl_minor=${PERL_VERSION:C|^([1-9]+)\.([0-9][0-9][0-9]).*|\2|}
+perl_patch=${PERL_VERSION:C|^.*(..)|\1|}
+.else # ${perl_minor} < 100
+_perl_patch=0${PERL_VERSION:C|^([1-9]+)\.([0-9]+)\.*|0|}
+perl_patch=${_perl_patch:C|^.*(..)|\1|}
+.endif # ${perl_minor} < 100
+PERL_LEVEL=${perl_major}${perl_minor}${perl_patch}
 
-PERL_MAJOR=${PERL_VER:C|^([1-9]+).*|\1|}
-PERL_MINOR=${PERL_VER:C|^[1-9]+\.0*([1-9]+).*|\1|}
+SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 
-.if ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+.if ${PERL_LEVEL} < 500601
 RUN_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
 BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
-.endif # ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+.endif # ${PERL_LEVEL} < 500601
 
 .if ${OSVERSION} > 500038
 BROKEN=	"on -CURRENT, can only be used with local files"
diff --git a/www/phoenix/files/mozconfig.in b/www/phoenix/files/mozconfig.in
index 8468f9514a85..c28769721c04 100644
--- a/www/phoenix/files/mozconfig.in
+++ b/www/phoenix/files/mozconfig.in
@@ -14,6 +14,7 @@ ac_add_options --disable-composer
 export CFLAGS="@CFLAGS@"
 export LIBS="@LIBS@"
 export CONFIG_SH=/bin/sh
+export XP_UNIX=1
 test -x /usr/bin/perl && export PERL=/usr/bin/perl \
     || export PERL=/usr/local/bin/perl
 mk_add_options PERL=$PERL