Changed MAINTAINER to my FreeBSD address.

svn path=/head/; revision=69236
2025-07-18 17:59:20 -04:00 · 2002-11-01 04:17:51 +00:00 · 2002-11-01 04:17:51 +00:00 · 7df6fabb8f · 2021-03-31 03:12:20 +00:00
commit 7df6fabb8f
parent 23bfffdf14
62 changed files with 525 additions and 249 deletions
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=grip

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 LIB_DEPENDS=	id3-3.7.13:${PORTSDIR}/audio/id3lib \
 		ghttp.1:${PORTSDIR}/www/libghttp
--- a/devel/ac-archive/Makefile
+++ b/devel/ac-archive/Makefile
@ -11,7 +11,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 RUN_DEPENDS=	autoconf:${PORTSDIR}/devel/autoconf

--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	autoconf

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		help2man:${PORTSDIR}/misc/help2man
--- a/devel/autoconf213/Makefile
+++ b/devel/autoconf213/Makefile
@ -17,7 +17,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEWARE} ${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	binutils autoconf
 DISTNAME=	autoconf-000227

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
--- a/devel/autoconf253/Makefile
+++ b/devel/autoconf253/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	autoconf

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		help2man:${PORTSDIR}/misc/help2man
--- a/devel/autoconf254/Makefile
+++ b/devel/autoconf254/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	autoconf

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		help2man:${PORTSDIR}/misc/help2man
--- a/devel/autoconf257/Makefile
+++ b/devel/autoconf257/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	autoconf

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		help2man:${PORTSDIR}/misc/help2man
--- a/devel/autoconf259/Makefile
+++ b/devel/autoconf259/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	autoconf

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		help2man:${PORTSDIR}/misc/help2man
--- a/devel/autoconf26/Makefile
+++ b/devel/autoconf26/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	autoconf

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		help2man:${PORTSDIR}/misc/help2man
--- a/devel/autoconf261/Makefile
+++ b/devel/autoconf261/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	autoconf

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		help2man:${PORTSDIR}/misc/help2man
--- a/devel/autoconf262/Makefile
+++ b/devel/autoconf262/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	autoconf

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		help2man:${PORTSDIR}/misc/help2man
--- a/devel/autoconf267/Makefile
+++ b/devel/autoconf267/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	autoconf

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		help2man:${PORTSDIR}/misc/help2man
--- a/devel/autoconf268/Makefile
+++ b/devel/autoconf268/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	autoconf

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		help2man:${PORTSDIR}/misc/help2man
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PERL=${PERL5}
--- a/devel/automake110/Makefile
+++ b/devel/automake110/Makefile
@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
 DISTNAME=	automake-${PORTVERSION}

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 .undef		NO_IGNORE
 BORKED=		"THIS IS A WORK IN PROGRESS. DON'T EVEN THINK ABOUT IT."
--- a/devel/automake14/Makefile
+++ b/devel/automake14/Makefile
@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
 DISTNAME=	automake-1.4-p5

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PERL=${PERL5}
--- a/devel/automake15/Makefile
+++ b/devel/automake15/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PERL=${PERL5}
--- a/devel/automake16/Makefile
+++ b/devel/automake16/Makefile
@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
 DISTNAME=	automake-${PORTVERSION}

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 .undef		NO_IGNORE
 BORKED=		"THIS IS A WORK IN PROGRESS. DON'T EVEN THINK ABOUT IT."
--- a/devel/automake17/Makefile
+++ b/devel/automake17/Makefile
@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
 DISTNAME=	automake-${PORTVERSION}

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 .undef		NO_IGNORE
 BORKED=		"THIS IS A WORK IN PROGRESS. DON'T EVEN THINK ABOUT IT."
--- a/devel/automake18/Makefile
+++ b/devel/automake18/Makefile
@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
 DISTNAME=	automake-${PORTVERSION}

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 .undef		NO_IGNORE
 BORKED=		"THIS IS A WORK IN PROGRESS. DON'T EVEN THINK ABOUT IT."
--- a/devel/automake19/Makefile
+++ b/devel/automake19/Makefile
@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
 DISTNAME=	automake-${PORTVERSION}

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 .undef		NO_IGNORE
 BORKED=		"THIS IS A WORK IN PROGRESS. DON'T EVEN THINK ABOUT IT."
--- a/devel/cvsbook/Makefile
+++ b/devel/cvsbook/Makefile
@ -11,7 +11,7 @@ CATEGORIES=	devel
 MASTER_SITES=	http://cvsbook.red-bean.com/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-all

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
--- a/devel/fam/Makefile
+++ b/devel/fam/Makefile
@ -14,7 +14,7 @@ PATCH_SITES=		ftp://oss.sgi.com/projects/fam/download/patches/
 PATCH_DIST_STRIP=	-p1
 PATCHFILES=		freebsd-mntent.patch # freebsd-build.patch

-MAINTAINER=		ports@geeksrus.net
+MAINTAINER=		AlanE@FreeBSD.org

 CFLAGS+=		-Wno-deprecated

--- a/devel/gnu-autoconf/Makefile
+++ b/devel/gnu-autoconf/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	autoconf

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		help2man:${PORTSDIR}/misc/help2man
--- a/devel/gnu-automake/Makefile
+++ b/devel/gnu-automake/Makefile
@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	automake
 DISTNAME=	automake-${PORTVERSION}

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 .undef		NO_IGNORE
 BORKED=		"THIS IS A WORK IN PROGRESS. DON'T EVEN THINK ABOUT IT."
--- a/devel/invitation_to_ruby/Makefile
+++ b/devel/invitation_to_ruby/Makefile
@ -2,7 +2,7 @@
 #
 # New ports collection makefile for:	invitation_to_ruby
 # Date created:			2002/08/28
-# Whom:				Alan Eldridge <ports@geeksrus.net>
+# Whom:				Alan Eldridge <AlanE@FreeBSD.org>
 #
 # $FreeBSD$
 #
@ -21,7 +21,7 @@ EXTRACT_SUFX=	.tgz
 #DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
 #EXTRACT_ONLY=

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 NO_BUILD=	yes

--- a/devel/ptypes/Makefile
+++ b/devel/ptypes/Makefile
@ -13,7 +13,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 CFLAGS+=	${PTHREAD_CFLAGS} -fPIC
 USE_REINPLACE=	yes
--- a/devel/py-optik/Makefile
+++ b/devel/py-optik/Makefile
@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Optik-${PORTVERSION}

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
--- a/devel/py-period/Makefile
+++ b/devel/py-period/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel python
 MASTER_SITES=	http://www.biostat.wisc.edu/~annis/creations/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 USE_PYTHON=	yes
 NO_BUILD=	yes
--- a/french/cups-base/Makefile
+++ b/french/cups-base/Makefile
@ -9,7 +9,7 @@ PORTNAME=	cups-base
 PORTVERSION=	${CUPS_PORTVER}
 CATEGORIES=	french print

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 CUPS_FR=	yes
 MASTERDIR=	${.CURDIR}/../../print/cups-base
--- a/french/cups-lpr/Makefile
+++ b/french/cups-lpr/Makefile
@ -9,7 +9,7 @@ PORTNAME=	cups-lpr
 PORTVERSION=	${CUPS_PORTVER}
 CATEGORIES=	french print

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 LIB_DEPENDS=	cups.2:${.CURDIR}/../../french/cups-base

--- a/french/cups/Makefile
+++ b/french/cups/Makefile
@ -9,7 +9,7 @@ PORTNAME=	cups
 PORTVERSION=	${CUPS_PORTVER}
 CATEGORIES=	french print

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 LIB_DEPENDS=	cups.2:${.CURDIR}/../../french/cups-base
 RUN_DEPENDS=	${LOCALBASE}/sbin/cupsaddsmb:${.CURDIR}/../../french/cups-lpr
--- a/lang/cyclone/Makefile
+++ b/lang/cyclone/Makefile
@ -2,7 +2,7 @@
 #
 # New ports collection makefile for:	cyclone
 # Date created:		2002/01/06
-# Whom:			AlanE <ports@geeksrus.net> et al
+# Whom:			AlanE <AlanE@FreeBSD.org> et al
 #
 # $FreeBSD$
 #
@ -17,7 +17,7 @@ MASTER_SITES=	http://www.cs.cornell.edu/projects/cyclone/software/
 DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz \
 		${PORTNAME}-${PORTVERSION}-docs.tar.gz

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 USE_GMAKE=	yes
 NO_PACKAGE=	'Neither CC nor CFLAGS safe.'
--- a/mail/archivemail/Makefile
+++ b/mail/archivemail/Makefile
@ -1,6 +1,6 @@
 # New ports collection makefile for:	archivemail
 # Date created:		2002/04/02
-# Whom:			Alan Eldridge <ports@geeksrus.net>
+# Whom:			Alan Eldridge <AlanE@FreeBSD.org>
 #
 # $FreeBSD$
 #
@ -12,7 +12,7 @@ CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
--- a/mail/gotmail/Makefile
+++ b/mail/gotmail/Makefile
@ -11,7 +11,7 @@ CATEGORIES=	mail perl5
 MASTER_SITES=	http://ssl.usu.edu/paul/gotmail/
 DISTNAME=	${PORTNAME}_${PORTVERSION}

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI \
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/p5-Mail-SpamAssassin/Makefile
@ -14,7 +14,7 @@ MASTER_SITES=	http://spamassassin.org/released/ \
 MASTER_SITE_SUBDIR=	Mail
 PKGNAMEPREFIX=	p5-

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
--- a/misc/kenny/Makefile
+++ b/misc/kenny/Makefile
@ -2,7 +2,7 @@
 #
 # New ports collection makefile for:	kenny
 # Date created:		2001/12/25
-# Whom:			Alan E ports@geeksrus.net
+# Whom:			Alan E AlanE@FreeBSD.org
 #
 # $FreeBSD$
 #
@ -16,7 +16,7 @@ DISTNAME=	kenny.pl-${PORTVERSION}
 EXTRACT_SUFX=	.gz
 EXTRACT_ONLY=

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 USE_PERL5=	yes
 NO_BUILD=	yes
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@ -10,7 +10,7 @@ PORTVERSION=	${CUPS_PORTVER}
 PORTREVISION=	4
 CATEGORIES?=	print

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 INSTALLS_SHLIB=	yes

--- a/print/cups-lpr/Makefile
+++ b/print/cups-lpr/Makefile
@ -10,7 +10,7 @@ PORTVERSION=	${CUPS_PORTVER}
 PORTREVISION=	1
 CATEGORIES?=	print

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 LIB_DEPENDS=	cups.2:${.CURDIR}/../../print/cups-base

--- a/print/cups-pstoraster/Makefile
+++ b/print/cups-pstoraster/Makefile
@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 MASTER_SITE_SUBDIR=	espgs
 DISTNAME=		espgs-${PORTVERSION}-source

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 LIB_DEPENDS=	cups.2:${PORTSDIR}/print/cups-base
 RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/fonts.scale:${PORTSDIR}/print/ghostscript-gnu
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@ -12,7 +12,7 @@ MASTER_SITES=	# empty
 DISTFILES=	# none
 EXTRACT_ONLY=	# empty

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 LIB_DEPENDS?=	cups.2:${.CURDIR}/../../print/cups-base
 RUN_DEPENDS?=	espgs:${.CURDIR}/../../print/cups-pstoraster \
--- a/print/envelope/Makefile
+++ b/print/envelope/Makefile
@ -2,7 +2,7 @@
 #
 # New ports collection makefile for:	envelope
 # Date created:		2002/03/24
-# Whom:			Alan Eldridge ports@geeksrus.net
+# Whom:			Alan Eldridge AlanE@FreeBSD.org
 #
 # $FreeBSD$
 #
@ -14,7 +14,7 @@ MASTER_SITES=	http://freefall.homeip.net/code/envelope/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 EXTRACT_SUFX=	.tgz

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 USE_REINPLACE=	yes
 NO_BUILD=	yes
--- a/sysutils/tree/Makefile
+++ b/sysutils/tree/Makefile
@ -1,6 +1,6 @@
 # New ports collection makefile for:	tree
 # Date created:		2001/12/24
-# Whom:			Alan Eldridge <ports@geeksrus.net>
+# Whom:			Alan Eldridge <AlanE@FreeBSD.org>
 #
 # $FreeBSD$
 #
@ -12,7 +12,7 @@ CATEGORIES=	sysutils
 MASTER_SITES=	ftp://mama.indstate.edu/linux/tree/
 EXTRACT_SUFX=	.tgz

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 MAN1=		tree.1

--- a/textproc/aft/Makefile
+++ b/textproc/aft/Makefile
@ -1,6 +1,6 @@
 # New ports collection makefile for:	aft
 # Date created:		2002/03/28
-# Whom:			Alan Eldridge <ports@geeksrus.net>
+# Whom:			Alan Eldridge <AlanE@FreeBSD.org>
 #
 # $FreeBSD$
 #
@ -10,7 +10,7 @@ PORTVERSION=	5.0792
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.maplefish.com/todd/

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
--- a/www/firefox-devel/Makefile
+++ b/www/firefox-devel/Makefile
@ -2,7 +2,7 @@
 #
 # New ports collection makefile for:	phoenix
 # Date created:			2002/10/21
-# Whom:				Alan Eldridge <ports@geeksrus.net>
+# Whom:				Alan Eldridge <AlanE@FreeBSD.org>
 #
 # $FreeBSD$
 #
@ -19,46 +19,69 @@ LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
-		freetype.9:${PORTSDIR}/print/freetype2
-#Xft2.2:${PORTSDIR}/x11-fonts/Xft
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		freetype-config:${PORTSDIR}/print/freetype2 \
-		perl5.8.0:${PORTSDIR}/lang/perl5.8
+		freetype.9:${PORTSDIR}/print/freetype2 \
+		IDL.2:${PORTSDIR}/devel/ORBit \
+		Xft2.2:${PORTSDIR}/x11-fonts/Xft

-PREFIX=		${X11BASE}/lib/${PORTNAME}
+BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
+		freetype-config:${PORTSDIR}/print/freetype2
+
+USE_X_PREFIX=		yes

 USE_BZIP2=		yes
 USE_GMAKE=		yes
+USE_REINPLACE=		yes
 #USE_AUTOCONF_VER=	213
 GNU_CONFIGURE=		yes
+
+USE_GNOMENG=		yes
+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}

 .include <bsd.port.pre.mk>

+SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+
+PERL_MAJOR=${PERL_VER:C|^([1-9]+).*|\1|}
+PERL_MINOR=${PERL_VER:C|^[1-9]+\.0*([1-9]+).*|\1|}
+
+.if ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+RUN_DEPENDS=	${BUILD_DEPENDS}
+.endif # ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+
 .if ${OSVERSION} > 500038
 BROKEN=	"on -CURRENT, can only be used with local files"
 .endif

-.if !defined(PERL_VER) || ${PERL_VER} != "5.8.0"
-.undef NO_IGNORE
-BROKEN=	This port requires Perl 5.8.0 because of File::Spec issues. \
-	Make sure to run 'use.perl port' after installing it or you \
-	will still get this message.
-.endif # !defined(PERL_VER) || ${PERL_VER} != "5.8.0"
-
 post-extract:
 	${SED} -e 's|@CFLAGS@|${CFLAGS}|'		\
 		-e 's|@LIBS@|${LIBS}|'			\
 		-e 's|@X11BASE@|${X11BASE}|'		\
 		-e 's|@LOCALBASE@|${LOCALBASE}|'	\
+		-e 's|@PREFIX@|${LOCAL_PREFIX}|'	\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig

+# fix for Xft (thanks to marcus@)
+post-patch:
+	cd ${WRKSRC}/gfx/src/gtk;				\
+	${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g'	\
+		nsDrawingSurfaceGTK.cpp	nsFontMetricsXft.h
+
 post-install:
-	${LN} -s ${PREFIX}/bin/phoenix ${X11BASE}/bin/phoenix
-	${LN} -s ${PREFIX}/bin/mozilla-config ${X11BASE}/bin/phoenix-config
+	${LN} -s ${LOCAL_PREFIX}/bin/phoenix \
+		${PREFIX}/bin/phoenix
+	${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
+		${PREFIX}/bin/phoenix-config

 .include <bsd.port.post.mk>

--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@ -2,7 +2,7 @@
 #
 # New ports collection makefile for:	phoenix
 # Date created:			2002/10/21
-# Whom:				Alan Eldridge <ports@geeksrus.net>
+# Whom:				Alan Eldridge <AlanE@FreeBSD.org>
 #
 # $FreeBSD$
 #
@ -19,46 +19,69 @@ LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
-		freetype.9:${PORTSDIR}/print/freetype2
-#Xft2.2:${PORTSDIR}/x11-fonts/Xft
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		freetype-config:${PORTSDIR}/print/freetype2 \
-		perl5.8.0:${PORTSDIR}/lang/perl5.8
+		freetype.9:${PORTSDIR}/print/freetype2 \
+		IDL.2:${PORTSDIR}/devel/ORBit \
+		Xft2.2:${PORTSDIR}/x11-fonts/Xft

-PREFIX=		${X11BASE}/lib/${PORTNAME}
+BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
+		freetype-config:${PORTSDIR}/print/freetype2
+
+USE_X_PREFIX=		yes

 USE_BZIP2=		yes
 USE_GMAKE=		yes
+USE_REINPLACE=		yes
 #USE_AUTOCONF_VER=	213
 GNU_CONFIGURE=		yes
+
+USE_GNOMENG=		yes
+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}

 .include <bsd.port.pre.mk>

+SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+
+PERL_MAJOR=${PERL_VER:C|^([1-9]+).*|\1|}
+PERL_MINOR=${PERL_VER:C|^[1-9]+\.0*([1-9]+).*|\1|}
+
+.if ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+RUN_DEPENDS=	${BUILD_DEPENDS}
+.endif # ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+
 .if ${OSVERSION} > 500038
 BROKEN=	"on -CURRENT, can only be used with local files"
 .endif

-.if !defined(PERL_VER) || ${PERL_VER} != "5.8.0"
-.undef NO_IGNORE
-BROKEN=	This port requires Perl 5.8.0 because of File::Spec issues. \
-	Make sure to run 'use.perl port' after installing it or you \
-	will still get this message.
-.endif # !defined(PERL_VER) || ${PERL_VER} != "5.8.0"
-
 post-extract:
 	${SED} -e 's|@CFLAGS@|${CFLAGS}|'		\
 		-e 's|@LIBS@|${LIBS}|'			\
 		-e 's|@X11BASE@|${X11BASE}|'		\
 		-e 's|@LOCALBASE@|${LOCALBASE}|'	\
+		-e 's|@PREFIX@|${LOCAL_PREFIX}|'	\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig

+# fix for Xft (thanks to marcus@)
+post-patch:
+	cd ${WRKSRC}/gfx/src/gtk;				\
+	${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g'	\
+		nsDrawingSurfaceGTK.cpp	nsFontMetricsXft.h
+
 post-install:
-	${LN} -s ${PREFIX}/bin/phoenix ${X11BASE}/bin/phoenix
-	${LN} -s ${PREFIX}/bin/mozilla-config ${X11BASE}/bin/phoenix-config
+	${LN} -s ${LOCAL_PREFIX}/bin/phoenix \
+		${PREFIX}/bin/phoenix
+	${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
+		${PREFIX}/bin/phoenix-config

 .include <bsd.port.post.mk>

--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@ -2,7 +2,7 @@
 #
 # New ports collection makefile for:	phoenix
 # Date created:			2002/10/21
-# Whom:				Alan Eldridge <ports@geeksrus.net>
+# Whom:				Alan Eldridge <AlanE@FreeBSD.org>
 #
 # $FreeBSD$
 #
@ -19,46 +19,69 @@ LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
-		freetype.9:${PORTSDIR}/print/freetype2
-#Xft2.2:${PORTSDIR}/x11-fonts/Xft
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		freetype-config:${PORTSDIR}/print/freetype2 \
-		perl5.8.0:${PORTSDIR}/lang/perl5.8
+		freetype.9:${PORTSDIR}/print/freetype2 \
+		IDL.2:${PORTSDIR}/devel/ORBit \
+		Xft2.2:${PORTSDIR}/x11-fonts/Xft

-PREFIX=		${X11BASE}/lib/${PORTNAME}
+BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
+		freetype-config:${PORTSDIR}/print/freetype2
+
+USE_X_PREFIX=		yes

 USE_BZIP2=		yes
 USE_GMAKE=		yes
+USE_REINPLACE=		yes
 #USE_AUTOCONF_VER=	213
 GNU_CONFIGURE=		yes
+
+USE_GNOMENG=		yes
+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}

 .include <bsd.port.pre.mk>

+SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+
+PERL_MAJOR=${PERL_VER:C|^([1-9]+).*|\1|}
+PERL_MINOR=${PERL_VER:C|^[1-9]+\.0*([1-9]+).*|\1|}
+
+.if ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+RUN_DEPENDS=	${BUILD_DEPENDS}
+.endif # ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+
 .if ${OSVERSION} > 500038
 BROKEN=	"on -CURRENT, can only be used with local files"
 .endif

-.if !defined(PERL_VER) || ${PERL_VER} != "5.8.0"
-.undef NO_IGNORE
-BROKEN=	This port requires Perl 5.8.0 because of File::Spec issues. \
-	Make sure to run 'use.perl port' after installing it or you \
-	will still get this message.
-.endif # !defined(PERL_VER) || ${PERL_VER} != "5.8.0"
-
 post-extract:
 	${SED} -e 's|@CFLAGS@|${CFLAGS}|'		\
 		-e 's|@LIBS@|${LIBS}|'			\
 		-e 's|@X11BASE@|${X11BASE}|'		\
 		-e 's|@LOCALBASE@|${LOCALBASE}|'	\
+		-e 's|@PREFIX@|${LOCAL_PREFIX}|'	\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig

+# fix for Xft (thanks to marcus@)
+post-patch:
+	cd ${WRKSRC}/gfx/src/gtk;				\
+	${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g'	\
+		nsDrawingSurfaceGTK.cpp	nsFontMetricsXft.h
+
 post-install:
-	${LN} -s ${PREFIX}/bin/phoenix ${X11BASE}/bin/phoenix
-	${LN} -s ${PREFIX}/bin/mozilla-config ${X11BASE}/bin/phoenix-config
+	${LN} -s ${LOCAL_PREFIX}/bin/phoenix \
+		${PREFIX}/bin/phoenix
+	${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
+		${PREFIX}/bin/phoenix-config

 .include <bsd.port.post.mk>

--- a/www/firefox10/Makefile
+++ b/www/firefox10/Makefile
@ -2,7 +2,7 @@
 #
 # New ports collection makefile for:	phoenix
 # Date created:			2002/10/21
-# Whom:				Alan Eldridge <ports@geeksrus.net>
+# Whom:				Alan Eldridge <AlanE@FreeBSD.org>
 #
 # $FreeBSD$
 #
@ -19,46 +19,69 @@ LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
-		freetype.9:${PORTSDIR}/print/freetype2
-#Xft2.2:${PORTSDIR}/x11-fonts/Xft
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		freetype-config:${PORTSDIR}/print/freetype2 \
-		perl5.8.0:${PORTSDIR}/lang/perl5.8
+		freetype.9:${PORTSDIR}/print/freetype2 \
+		IDL.2:${PORTSDIR}/devel/ORBit \
+		Xft2.2:${PORTSDIR}/x11-fonts/Xft

-PREFIX=		${X11BASE}/lib/${PORTNAME}
+BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
+		freetype-config:${PORTSDIR}/print/freetype2
+
+USE_X_PREFIX=		yes

 USE_BZIP2=		yes
 USE_GMAKE=		yes
+USE_REINPLACE=		yes
 #USE_AUTOCONF_VER=	213
 GNU_CONFIGURE=		yes
+
+USE_GNOMENG=		yes
+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}

 .include <bsd.port.pre.mk>

+SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+
+PERL_MAJOR=${PERL_VER:C|^([1-9]+).*|\1|}
+PERL_MINOR=${PERL_VER:C|^[1-9]+\.0*([1-9]+).*|\1|}
+
+.if ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+RUN_DEPENDS=	${BUILD_DEPENDS}
+.endif # ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+
 .if ${OSVERSION} > 500038
 BROKEN=	"on -CURRENT, can only be used with local files"
 .endif

-.if !defined(PERL_VER) || ${PERL_VER} != "5.8.0"
-.undef NO_IGNORE
-BROKEN=	This port requires Perl 5.8.0 because of File::Spec issues. \
-	Make sure to run 'use.perl port' after installing it or you \
-	will still get this message.
-.endif # !defined(PERL_VER) || ${PERL_VER} != "5.8.0"
-
 post-extract:
 	${SED} -e 's|@CFLAGS@|${CFLAGS}|'		\
 		-e 's|@LIBS@|${LIBS}|'			\
 		-e 's|@X11BASE@|${X11BASE}|'		\
 		-e 's|@LOCALBASE@|${LOCALBASE}|'	\
+		-e 's|@PREFIX@|${LOCAL_PREFIX}|'	\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig

+# fix for Xft (thanks to marcus@)
+post-patch:
+	cd ${WRKSRC}/gfx/src/gtk;				\
+	${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g'	\
+		nsDrawingSurfaceGTK.cpp	nsFontMetricsXft.h
+
 post-install:
-	${LN} -s ${PREFIX}/bin/phoenix ${X11BASE}/bin/phoenix
-	${LN} -s ${PREFIX}/bin/mozilla-config ${X11BASE}/bin/phoenix-config
+	${LN} -s ${LOCAL_PREFIX}/bin/phoenix \
+		${PREFIX}/bin/phoenix
+	${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
+		${PREFIX}/bin/phoenix-config

 .include <bsd.port.post.mk>

--- a/www/firefox15/Makefile
+++ b/www/firefox15/Makefile
@ -2,7 +2,7 @@
 #
 # New ports collection makefile for:	phoenix
 # Date created:			2002/10/21
-# Whom:				Alan Eldridge <ports@geeksrus.net>
+# Whom:				Alan Eldridge <AlanE@FreeBSD.org>
 #
 # $FreeBSD$
 #
@ -19,46 +19,69 @@ LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
-		freetype.9:${PORTSDIR}/print/freetype2
-#Xft2.2:${PORTSDIR}/x11-fonts/Xft
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		freetype-config:${PORTSDIR}/print/freetype2 \
-		perl5.8.0:${PORTSDIR}/lang/perl5.8
+		freetype.9:${PORTSDIR}/print/freetype2 \
+		IDL.2:${PORTSDIR}/devel/ORBit \
+		Xft2.2:${PORTSDIR}/x11-fonts/Xft

-PREFIX=		${X11BASE}/lib/${PORTNAME}
+BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
+		freetype-config:${PORTSDIR}/print/freetype2
+
+USE_X_PREFIX=		yes

 USE_BZIP2=		yes
 USE_GMAKE=		yes
+USE_REINPLACE=		yes
 #USE_AUTOCONF_VER=	213
 GNU_CONFIGURE=		yes
+
+USE_GNOMENG=		yes
+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}

 .include <bsd.port.pre.mk>

+SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+
+PERL_MAJOR=${PERL_VER:C|^([1-9]+).*|\1|}
+PERL_MINOR=${PERL_VER:C|^[1-9]+\.0*([1-9]+).*|\1|}
+
+.if ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+RUN_DEPENDS=	${BUILD_DEPENDS}
+.endif # ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+
 .if ${OSVERSION} > 500038
 BROKEN=	"on -CURRENT, can only be used with local files"
 .endif

-.if !defined(PERL_VER) || ${PERL_VER} != "5.8.0"
-.undef NO_IGNORE
-BROKEN=	This port requires Perl 5.8.0 because of File::Spec issues. \
-	Make sure to run 'use.perl port' after installing it or you \
-	will still get this message.
-.endif # !defined(PERL_VER) || ${PERL_VER} != "5.8.0"
-
 post-extract:
 	${SED} -e 's|@CFLAGS@|${CFLAGS}|'		\
 		-e 's|@LIBS@|${LIBS}|'			\
 		-e 's|@X11BASE@|${X11BASE}|'		\
 		-e 's|@LOCALBASE@|${LOCALBASE}|'	\
+		-e 's|@PREFIX@|${LOCAL_PREFIX}|'	\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig

+# fix for Xft (thanks to marcus@)
+post-patch:
+	cd ${WRKSRC}/gfx/src/gtk;				\
+	${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g'	\
+		nsDrawingSurfaceGTK.cpp	nsFontMetricsXft.h
+
 post-install:
-	${LN} -s ${PREFIX}/bin/phoenix ${X11BASE}/bin/phoenix
-	${LN} -s ${PREFIX}/bin/mozilla-config ${X11BASE}/bin/phoenix-config
+	${LN} -s ${LOCAL_PREFIX}/bin/phoenix \
+		${PREFIX}/bin/phoenix
+	${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
+		${PREFIX}/bin/phoenix-config

 .include <bsd.port.post.mk>

--- a/www/firefox3-devel/Makefile
+++ b/www/firefox3-devel/Makefile
@ -2,7 +2,7 @@
 #
 # New ports collection makefile for:	phoenix
 # Date created:			2002/10/21
-# Whom:				Alan Eldridge <ports@geeksrus.net>
+# Whom:				Alan Eldridge <AlanE@FreeBSD.org>
 #
 # $FreeBSD$
 #
@ -19,46 +19,69 @@ LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
-		freetype.9:${PORTSDIR}/print/freetype2
-#Xft2.2:${PORTSDIR}/x11-fonts/Xft
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		freetype-config:${PORTSDIR}/print/freetype2 \
-		perl5.8.0:${PORTSDIR}/lang/perl5.8
+		freetype.9:${PORTSDIR}/print/freetype2 \
+		IDL.2:${PORTSDIR}/devel/ORBit \
+		Xft2.2:${PORTSDIR}/x11-fonts/Xft

-PREFIX=		${X11BASE}/lib/${PORTNAME}
+BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
+		freetype-config:${PORTSDIR}/print/freetype2
+
+USE_X_PREFIX=		yes

 USE_BZIP2=		yes
 USE_GMAKE=		yes
+USE_REINPLACE=		yes
 #USE_AUTOCONF_VER=	213
 GNU_CONFIGURE=		yes
+
+USE_GNOMENG=		yes
+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}

 .include <bsd.port.pre.mk>

+SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+
+PERL_MAJOR=${PERL_VER:C|^([1-9]+).*|\1|}
+PERL_MINOR=${PERL_VER:C|^[1-9]+\.0*([1-9]+).*|\1|}
+
+.if ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+RUN_DEPENDS=	${BUILD_DEPENDS}
+.endif # ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+
 .if ${OSVERSION} > 500038
 BROKEN=	"on -CURRENT, can only be used with local files"
 .endif

-.if !defined(PERL_VER) || ${PERL_VER} != "5.8.0"
-.undef NO_IGNORE
-BROKEN=	This port requires Perl 5.8.0 because of File::Spec issues. \
-	Make sure to run 'use.perl port' after installing it or you \
-	will still get this message.
-.endif # !defined(PERL_VER) || ${PERL_VER} != "5.8.0"
-
 post-extract:
 	${SED} -e 's|@CFLAGS@|${CFLAGS}|'		\
 		-e 's|@LIBS@|${LIBS}|'			\
 		-e 's|@X11BASE@|${X11BASE}|'		\
 		-e 's|@LOCALBASE@|${LOCALBASE}|'	\
+		-e 's|@PREFIX@|${LOCAL_PREFIX}|'	\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig

+# fix for Xft (thanks to marcus@)
+post-patch:
+	cd ${WRKSRC}/gfx/src/gtk;				\
+	${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g'	\
+		nsDrawingSurfaceGTK.cpp	nsFontMetricsXft.h
+
 post-install:
-	${LN} -s ${PREFIX}/bin/phoenix ${X11BASE}/bin/phoenix
-	${LN} -s ${PREFIX}/bin/mozilla-config ${X11BASE}/bin/phoenix-config
+	${LN} -s ${LOCAL_PREFIX}/bin/phoenix \
+		${PREFIX}/bin/phoenix
+	${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
+		${PREFIX}/bin/phoenix-config

 .include <bsd.port.post.mk>

--- a/www/firefox35/Makefile
+++ b/www/firefox35/Makefile
@ -2,7 +2,7 @@
 #
 # New ports collection makefile for:	phoenix
 # Date created:			2002/10/21
-# Whom:				Alan Eldridge <ports@geeksrus.net>
+# Whom:				Alan Eldridge <AlanE@FreeBSD.org>
 #
 # $FreeBSD$
 #
@ -19,46 +19,69 @@ LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
-		freetype.9:${PORTSDIR}/print/freetype2
-#Xft2.2:${PORTSDIR}/x11-fonts/Xft
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		freetype-config:${PORTSDIR}/print/freetype2 \
-		perl5.8.0:${PORTSDIR}/lang/perl5.8
+		freetype.9:${PORTSDIR}/print/freetype2 \
+		IDL.2:${PORTSDIR}/devel/ORBit \
+		Xft2.2:${PORTSDIR}/x11-fonts/Xft

-PREFIX=		${X11BASE}/lib/${PORTNAME}
+BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
+		freetype-config:${PORTSDIR}/print/freetype2
+
+USE_X_PREFIX=		yes

 USE_BZIP2=		yes
 USE_GMAKE=		yes
+USE_REINPLACE=		yes
 #USE_AUTOCONF_VER=	213
 GNU_CONFIGURE=		yes
+
+USE_GNOMENG=		yes
+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}

 .include <bsd.port.pre.mk>

+SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+
+PERL_MAJOR=${PERL_VER:C|^([1-9]+).*|\1|}
+PERL_MINOR=${PERL_VER:C|^[1-9]+\.0*([1-9]+).*|\1|}
+
+.if ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+RUN_DEPENDS=	${BUILD_DEPENDS}
+.endif # ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+
 .if ${OSVERSION} > 500038
 BROKEN=	"on -CURRENT, can only be used with local files"
 .endif

-.if !defined(PERL_VER) || ${PERL_VER} != "5.8.0"
-.undef NO_IGNORE
-BROKEN=	This port requires Perl 5.8.0 because of File::Spec issues. \
-	Make sure to run 'use.perl port' after installing it or you \
-	will still get this message.
-.endif # !defined(PERL_VER) || ${PERL_VER} != "5.8.0"
-
 post-extract:
 	${SED} -e 's|@CFLAGS@|${CFLAGS}|'		\
 		-e 's|@LIBS@|${LIBS}|'			\
 		-e 's|@X11BASE@|${X11BASE}|'		\
 		-e 's|@LOCALBASE@|${LOCALBASE}|'	\
+		-e 's|@PREFIX@|${LOCAL_PREFIX}|'	\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig

+# fix for Xft (thanks to marcus@)
+post-patch:
+	cd ${WRKSRC}/gfx/src/gtk;				\
+	${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g'	\
+		nsDrawingSurfaceGTK.cpp	nsFontMetricsXft.h
+
 post-install:
-	${LN} -s ${PREFIX}/bin/phoenix ${X11BASE}/bin/phoenix
-	${LN} -s ${PREFIX}/bin/mozilla-config ${X11BASE}/bin/phoenix-config
+	${LN} -s ${LOCAL_PREFIX}/bin/phoenix \
+		${PREFIX}/bin/phoenix
+	${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
+		${PREFIX}/bin/phoenix-config

 .include <bsd.port.post.mk>

--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@ -2,7 +2,7 @@
 #
 # New ports collection makefile for:	phoenix
 # Date created:			2002/10/21
-# Whom:				Alan Eldridge <ports@geeksrus.net>
+# Whom:				Alan Eldridge <AlanE@FreeBSD.org>
 #
 # $FreeBSD$
 #
@ -19,46 +19,69 @@ LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
-		freetype.9:${PORTSDIR}/print/freetype2
-#Xft2.2:${PORTSDIR}/x11-fonts/Xft
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		freetype-config:${PORTSDIR}/print/freetype2 \
-		perl5.8.0:${PORTSDIR}/lang/perl5.8
+		freetype.9:${PORTSDIR}/print/freetype2 \
+		IDL.2:${PORTSDIR}/devel/ORBit \
+		Xft2.2:${PORTSDIR}/x11-fonts/Xft

-PREFIX=		${X11BASE}/lib/${PORTNAME}
+BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
+		freetype-config:${PORTSDIR}/print/freetype2
+
+USE_X_PREFIX=		yes

 USE_BZIP2=		yes
 USE_GMAKE=		yes
+USE_REINPLACE=		yes
 #USE_AUTOCONF_VER=	213
 GNU_CONFIGURE=		yes
+
+USE_GNOMENG=		yes
+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}

 .include <bsd.port.pre.mk>

+SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+
+PERL_MAJOR=${PERL_VER:C|^([1-9]+).*|\1|}
+PERL_MINOR=${PERL_VER:C|^[1-9]+\.0*([1-9]+).*|\1|}
+
+.if ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+RUN_DEPENDS=	${BUILD_DEPENDS}
+.endif # ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+
 .if ${OSVERSION} > 500038
 BROKEN=	"on -CURRENT, can only be used with local files"
 .endif

-.if !defined(PERL_VER) || ${PERL_VER} != "5.8.0"
-.undef NO_IGNORE
-BROKEN=	This port requires Perl 5.8.0 because of File::Spec issues. \
-	Make sure to run 'use.perl port' after installing it or you \
-	will still get this message.
-.endif # !defined(PERL_VER) || ${PERL_VER} != "5.8.0"
-
 post-extract:
 	${SED} -e 's|@CFLAGS@|${CFLAGS}|'		\
 		-e 's|@LIBS@|${LIBS}|'			\
 		-e 's|@X11BASE@|${X11BASE}|'		\
 		-e 's|@LOCALBASE@|${LOCALBASE}|'	\
+		-e 's|@PREFIX@|${LOCAL_PREFIX}|'	\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig

+# fix for Xft (thanks to marcus@)
+post-patch:
+	cd ${WRKSRC}/gfx/src/gtk;				\
+	${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g'	\
+		nsDrawingSurfaceGTK.cpp	nsFontMetricsXft.h
+
 post-install:
-	${LN} -s ${PREFIX}/bin/phoenix ${X11BASE}/bin/phoenix
-	${LN} -s ${PREFIX}/bin/mozilla-config ${X11BASE}/bin/phoenix-config
+	${LN} -s ${LOCAL_PREFIX}/bin/phoenix \
+		${PREFIX}/bin/phoenix
+	${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
+		${PREFIX}/bin/phoenix-config

 .include <bsd.port.post.mk>

--- a/www/flock/Makefile
+++ b/www/flock/Makefile
@ -2,7 +2,7 @@
 #
 # New ports collection makefile for:	phoenix
 # Date created:			2002/10/21
-# Whom:				Alan Eldridge <ports@geeksrus.net>
+# Whom:				Alan Eldridge <AlanE@FreeBSD.org>
 #
 # $FreeBSD$
 #
@ -19,46 +19,69 @@ LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
-		freetype.9:${PORTSDIR}/print/freetype2
-#Xft2.2:${PORTSDIR}/x11-fonts/Xft
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		freetype-config:${PORTSDIR}/print/freetype2 \
-		perl5.8.0:${PORTSDIR}/lang/perl5.8
+		freetype.9:${PORTSDIR}/print/freetype2 \
+		IDL.2:${PORTSDIR}/devel/ORBit \
+		Xft2.2:${PORTSDIR}/x11-fonts/Xft

-PREFIX=		${X11BASE}/lib/${PORTNAME}
+BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
+		freetype-config:${PORTSDIR}/print/freetype2
+
+USE_X_PREFIX=		yes

 USE_BZIP2=		yes
 USE_GMAKE=		yes
+USE_REINPLACE=		yes
 #USE_AUTOCONF_VER=	213
 GNU_CONFIGURE=		yes
+
+USE_GNOMENG=		yes
+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}

 .include <bsd.port.pre.mk>

+SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+
+PERL_MAJOR=${PERL_VER:C|^([1-9]+).*|\1|}
+PERL_MINOR=${PERL_VER:C|^[1-9]+\.0*([1-9]+).*|\1|}
+
+.if ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+RUN_DEPENDS=	${BUILD_DEPENDS}
+.endif # ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+
 .if ${OSVERSION} > 500038
 BROKEN=	"on -CURRENT, can only be used with local files"
 .endif

-.if !defined(PERL_VER) || ${PERL_VER} != "5.8.0"
-.undef NO_IGNORE
-BROKEN=	This port requires Perl 5.8.0 because of File::Spec issues. \
-	Make sure to run 'use.perl port' after installing it or you \
-	will still get this message.
-.endif # !defined(PERL_VER) || ${PERL_VER} != "5.8.0"
-
 post-extract:
 	${SED} -e 's|@CFLAGS@|${CFLAGS}|'		\
 		-e 's|@LIBS@|${LIBS}|'			\
 		-e 's|@X11BASE@|${X11BASE}|'		\
 		-e 's|@LOCALBASE@|${LOCALBASE}|'	\
+		-e 's|@PREFIX@|${LOCAL_PREFIX}|'	\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig

+# fix for Xft (thanks to marcus@)
+post-patch:
+	cd ${WRKSRC}/gfx/src/gtk;				\
+	${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g'	\
+		nsDrawingSurfaceGTK.cpp	nsFontMetricsXft.h
+
 post-install:
-	${LN} -s ${PREFIX}/bin/phoenix ${X11BASE}/bin/phoenix
-	${LN} -s ${PREFIX}/bin/mozilla-config ${X11BASE}/bin/phoenix-config
+	${LN} -s ${LOCAL_PREFIX}/bin/phoenix \
+		${PREFIX}/bin/phoenix
+	${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
+		${PREFIX}/bin/phoenix-config

 .include <bsd.port.post.mk>

--- a/www/mozilla-firebird/Makefile
+++ b/www/mozilla-firebird/Makefile
@ -2,7 +2,7 @@
 #
 # New ports collection makefile for:	phoenix
 # Date created:			2002/10/21
-# Whom:				Alan Eldridge <ports@geeksrus.net>
+# Whom:				Alan Eldridge <AlanE@FreeBSD.org>
 #
 # $FreeBSD$
 #
@ -19,46 +19,69 @@ LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
-		freetype.9:${PORTSDIR}/print/freetype2
-#Xft2.2:${PORTSDIR}/x11-fonts/Xft
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		freetype-config:${PORTSDIR}/print/freetype2 \
-		perl5.8.0:${PORTSDIR}/lang/perl5.8
+		freetype.9:${PORTSDIR}/print/freetype2 \
+		IDL.2:${PORTSDIR}/devel/ORBit \
+		Xft2.2:${PORTSDIR}/x11-fonts/Xft

-PREFIX=		${X11BASE}/lib/${PORTNAME}
+BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
+		freetype-config:${PORTSDIR}/print/freetype2
+
+USE_X_PREFIX=		yes

 USE_BZIP2=		yes
 USE_GMAKE=		yes
+USE_REINPLACE=		yes
 #USE_AUTOCONF_VER=	213
 GNU_CONFIGURE=		yes
+
+USE_GNOMENG=		yes
+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}

 .include <bsd.port.pre.mk>

+SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+
+PERL_MAJOR=${PERL_VER:C|^([1-9]+).*|\1|}
+PERL_MINOR=${PERL_VER:C|^[1-9]+\.0*([1-9]+).*|\1|}
+
+.if ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+RUN_DEPENDS=	${BUILD_DEPENDS}
+.endif # ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+
 .if ${OSVERSION} > 500038
 BROKEN=	"on -CURRENT, can only be used with local files"
 .endif

-.if !defined(PERL_VER) || ${PERL_VER} != "5.8.0"
-.undef NO_IGNORE
-BROKEN=	This port requires Perl 5.8.0 because of File::Spec issues. \
-	Make sure to run 'use.perl port' after installing it or you \
-	will still get this message.
-.endif # !defined(PERL_VER) || ${PERL_VER} != "5.8.0"
-
 post-extract:
 	${SED} -e 's|@CFLAGS@|${CFLAGS}|'		\
 		-e 's|@LIBS@|${LIBS}|'			\
 		-e 's|@X11BASE@|${X11BASE}|'		\
 		-e 's|@LOCALBASE@|${LOCALBASE}|'	\
+		-e 's|@PREFIX@|${LOCAL_PREFIX}|'	\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig

+# fix for Xft (thanks to marcus@)
+post-patch:
+	cd ${WRKSRC}/gfx/src/gtk;				\
+	${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g'	\
+		nsDrawingSurfaceGTK.cpp	nsFontMetricsXft.h
+
 post-install:
-	${LN} -s ${PREFIX}/bin/phoenix ${X11BASE}/bin/phoenix
-	${LN} -s ${PREFIX}/bin/mozilla-config ${X11BASE}/bin/phoenix-config
+	${LN} -s ${LOCAL_PREFIX}/bin/phoenix \
+		${PREFIX}/bin/phoenix
+	${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
+		${PREFIX}/bin/phoenix-config

 .include <bsd.port.post.mk>

--- a/www/phoenix-devel/Makefile
+++ b/www/phoenix-devel/Makefile
@ -2,7 +2,7 @@
 #
 # New ports collection makefile for:	phoenix
 # Date created:			2002/10/21
-# Whom:				Alan Eldridge <ports@geeksrus.net>
+# Whom:				Alan Eldridge <AlanE@FreeBSD.org>
 #
 # $FreeBSD$
 #
@ -19,46 +19,69 @@ LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
-		freetype.9:${PORTSDIR}/print/freetype2
-#Xft2.2:${PORTSDIR}/x11-fonts/Xft
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		freetype-config:${PORTSDIR}/print/freetype2 \
-		perl5.8.0:${PORTSDIR}/lang/perl5.8
+		freetype.9:${PORTSDIR}/print/freetype2 \
+		IDL.2:${PORTSDIR}/devel/ORBit \
+		Xft2.2:${PORTSDIR}/x11-fonts/Xft

-PREFIX=		${X11BASE}/lib/${PORTNAME}
+BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
+		freetype-config:${PORTSDIR}/print/freetype2
+
+USE_X_PREFIX=		yes

 USE_BZIP2=		yes
 USE_GMAKE=		yes
+USE_REINPLACE=		yes
 #USE_AUTOCONF_VER=	213
 GNU_CONFIGURE=		yes
+
+USE_GNOMENG=		yes
+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}

 .include <bsd.port.pre.mk>

+SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+
+PERL_MAJOR=${PERL_VER:C|^([1-9]+).*|\1|}
+PERL_MINOR=${PERL_VER:C|^[1-9]+\.0*([1-9]+).*|\1|}
+
+.if ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+RUN_DEPENDS=	${BUILD_DEPENDS}
+.endif # ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+
 .if ${OSVERSION} > 500038
 BROKEN=	"on -CURRENT, can only be used with local files"
 .endif

-.if !defined(PERL_VER) || ${PERL_VER} != "5.8.0"
-.undef NO_IGNORE
-BROKEN=	This port requires Perl 5.8.0 because of File::Spec issues. \
-	Make sure to run 'use.perl port' after installing it or you \
-	will still get this message.
-.endif # !defined(PERL_VER) || ${PERL_VER} != "5.8.0"
-
 post-extract:
 	${SED} -e 's|@CFLAGS@|${CFLAGS}|'		\
 		-e 's|@LIBS@|${LIBS}|'			\
 		-e 's|@X11BASE@|${X11BASE}|'		\
 		-e 's|@LOCALBASE@|${LOCALBASE}|'	\
+		-e 's|@PREFIX@|${LOCAL_PREFIX}|'	\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig

+# fix for Xft (thanks to marcus@)
+post-patch:
+	cd ${WRKSRC}/gfx/src/gtk;				\
+	${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g'	\
+		nsDrawingSurfaceGTK.cpp	nsFontMetricsXft.h
+
 post-install:
-	${LN} -s ${PREFIX}/bin/phoenix ${X11BASE}/bin/phoenix
-	${LN} -s ${PREFIX}/bin/mozilla-config ${X11BASE}/bin/phoenix-config
+	${LN} -s ${LOCAL_PREFIX}/bin/phoenix \
+		${PREFIX}/bin/phoenix
+	${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
+		${PREFIX}/bin/phoenix-config

 .include <bsd.port.post.mk>

--- a/www/phoenix/Makefile
+++ b/www/phoenix/Makefile
@ -2,7 +2,7 @@
 #
 # New ports collection makefile for:	phoenix
 # Date created:			2002/10/21
-# Whom:				Alan Eldridge <ports@geeksrus.net>
+# Whom:				Alan Eldridge <AlanE@FreeBSD.org>
 #
 # $FreeBSD$
 #
@ -19,46 +19,69 @@ LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		mng.1:${PORTSDIR}/graphics/libmng \
-		freetype.9:${PORTSDIR}/print/freetype2
-#Xft2.2:${PORTSDIR}/x11-fonts/Xft
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
-		freetype-config:${PORTSDIR}/print/freetype2 \
-		perl5.8.0:${PORTSDIR}/lang/perl5.8
+		freetype.9:${PORTSDIR}/print/freetype2 \
+		IDL.2:${PORTSDIR}/devel/ORBit \
+		Xft2.2:${PORTSDIR}/x11-fonts/Xft

-PREFIX=		${X11BASE}/lib/${PORTNAME}
+BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
+		freetype-config:${PORTSDIR}/print/freetype2
+
+USE_X_PREFIX=		yes

 USE_BZIP2=		yes
 USE_GMAKE=		yes
+USE_REINPLACE=		yes
 #USE_AUTOCONF_VER=	213
 GNU_CONFIGURE=		yes
+
+USE_GNOMENG=		yes
+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}

 .include <bsd.port.pre.mk>

+SITE_PERL?=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+
+PERL_MAJOR=${PERL_VER:C|^([1-9]+).*|\1|}
+PERL_MINOR=${PERL_VER:C|^[1-9]+\.0*([1-9]+).*|\1|}
+
+.if ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+BUILD_DEPENDS+=	${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec
+RUN_DEPENDS=	${BUILD_DEPENDS}
+.endif # ${PERL_MAJOR} < 5 || ${PERL_MAJOR} == 5 && ${PERL_MINOR} < 8
+
 .if ${OSVERSION} > 500038
 BROKEN=	"on -CURRENT, can only be used with local files"
 .endif

-.if !defined(PERL_VER) || ${PERL_VER} != "5.8.0"
-.undef NO_IGNORE
-BROKEN=	This port requires Perl 5.8.0 because of File::Spec issues. \
-	Make sure to run 'use.perl port' after installing it or you \
-	will still get this message.
-.endif # !defined(PERL_VER) || ${PERL_VER} != "5.8.0"
-
 post-extract:
 	${SED} -e 's|@CFLAGS@|${CFLAGS}|'		\
 		-e 's|@LIBS@|${LIBS}|'			\
 		-e 's|@X11BASE@|${X11BASE}|'		\
 		-e 's|@LOCALBASE@|${LOCALBASE}|'	\
+		-e 's|@PREFIX@|${LOCAL_PREFIX}|'	\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig

+# fix for Xft (thanks to marcus@)
+post-patch:
+	cd ${WRKSRC}/gfx/src/gtk;				\
+	${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g'	\
+		nsDrawingSurfaceGTK.cpp	nsFontMetricsXft.h
+
 post-install:
-	${LN} -s ${PREFIX}/bin/phoenix ${X11BASE}/bin/phoenix
-	${LN} -s ${PREFIX}/bin/mozilla-config ${X11BASE}/bin/phoenix-config
+	${LN} -s ${LOCAL_PREFIX}/bin/phoenix \
+		${PREFIX}/bin/phoenix
+	${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
+		${PREFIX}/bin/phoenix-config

 .include <bsd.port.post.mk>

--- a/www/zope/Makefile
+++ b/www/zope/Makefile
@ -13,7 +13,7 @@ MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 USE_PYTHON=	yes
 PYTHON_VERSION=	python2.1
--- a/www/zope210/Makefile
+++ b/www/zope210/Makefile
@ -13,7 +13,7 @@ MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 USE_PYTHON=	yes
 PYTHON_VERSION=	python2.1
--- a/www/zope211/Makefile
+++ b/www/zope211/Makefile
@ -13,7 +13,7 @@ MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 USE_PYTHON=	yes
 PYTHON_VERSION=	python2.1
--- a/www/zope213/Makefile
+++ b/www/zope213/Makefile
@ -13,7 +13,7 @@ MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 USE_PYTHON=	yes
 PYTHON_VERSION=	python2.1
--- a/www/zope28/Makefile
+++ b/www/zope28/Makefile
@ -13,7 +13,7 @@ MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 USE_PYTHON=	yes
 PYTHON_VERSION=	python2.1
--- a/www/zope29/Makefile
+++ b/www/zope29/Makefile
@ -13,7 +13,7 @@ MASTER_SITES=	http://www.zope.org/Products/Zope/${PORTVERSION}/
 DISTNAME=	Zope-${PORTVERSION}-src
 EXTRACT_SUFX=	.tgz

-MAINTAINER=	ports@geeksrus.net
+MAINTAINER=	AlanE@FreeBSD.org

 USE_PYTHON=	yes
 PYTHON_VERSION=	python2.1