Update Phoenix to 0.5, the last release named Phoenix. Fixes a lot a bugs,

adds some features, there is at least one crasher I've hit so far but I don't
know if it is anomoly or not yet.

Approved by:	kris

5 files changed, 106 insertions, 71 deletions

diff --git a/www/flock/Makefile b/www/flock/Makefile
index ad1a31a770cd..782a3adc2d54 100644
--- a/www/flock/Makefile
+++ b/www/flock/Makefile
@@ -1,4 +1,4 @@
-# ex:ts=8
+# ex:ts=8 -*-mode: makefile-*-
 #
 # New ports collection makefile for:	phoenix
 # Date created:			2002/10/21
@@ -8,11 +8,11 @@
 #
 
 PORTNAME=		phoenix
-PORTVERSION=		0.4
-PORTREVISION=		9
+PORTVERSION=		0.5.20021209
+PORTREVISION=		0
 CATEGORIES=		www # pita
-MASTER_SITES=		${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	trevor
+MASTER_SITES=		${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
+MASTER_SITE_SUBDIR=	alane
 
 MAINTAINER=		phoenix@freebsd.org # alane@fbsd and trevor@fbsd
 
@@ -23,10 +23,11 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		IDL.2:${PORTSDIR}/devel/ORBit \
 		Xft2.2:${PORTSDIR}/x11-fonts/Xft \
 		iconv.3:${PORTSDIR}/converters/libiconv
-
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 		freetype-config:${PORTSDIR}/print/freetype2
 
+BSD_WEBDIR=http://people.freebsd.org/~${MASTER_SITE_SUBDIR}/
+
 USE_X_PREFIX=		yes
 
 USE_BZIP2=		yes
@@ -48,7 +49,8 @@ WRKSRC=			${WRKDIR}/mozilla
 LOCAL_SUBDIR=		lib/${PORTNAME}
 LOCAL_PREFIX=		${PREFIX}/${LOCAL_SUBDIR}
 JREDIR=			${LOCALBASE}/jdk1.3.1/jre
-PLUGINSDIR=		${LOCAL_PREFIX}/lib/mozilla-1.2b/plugins/
+MOZVER=			1.3a
+PLUGINSDIR=		${LOCAL_PREFIX}/lib/mozilla-${MOZVER}/plugins/
 
 .include <bsd.port.pre.mk>
 
@@ -83,37 +85,50 @@ post-patch:
 	${REINPLACE_CMD} -e 's|X11/Xft/Xft\.h|X11/Xft/Xft2.h|g'	\
 		nsDrawingSurfaceGTK.cpp	nsFontMetricsXft.h
 
-pre-install:
+post-build:
 	${RM} -f ${PLIST}
 	${TOUCH} ${PLIST}
 
-post-install:
-	@${RM} -f ${PREFIX}/bin/phoenix
-	@${LN} -s ${LOCAL_PREFIX}/bin/phoenix \
+pre-install:
+	${RM} -fr ${LOCAL_PREFIX}
+
+link-bins:
+	${RM} -f ${PREFIX}/bin/phoenix
+	${LN} -s ${LOCAL_PREFIX}/bin/phoenix \
 		${PREFIX}/bin/phoenix
-	@${RM} -f ${PREFIX}/bin/phoenix-config
-	@${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
+	${RM} -f ${PREFIX}/bin/phoenix-config
+	${LN} -s ${LOCAL_PREFIX}/bin/mozilla-config \
 		${PREFIX}/bin/phoenix-config
-	@${CAT} ${PKGMESSAGE} 2>/dev/null
-	@${RM} -fr ${LOCAL_PREFIX}/share/idl
-	@${RM} -fr ${LOCAL_PREFIX}/include
+
+link-java:
 	-${RM} -f ${PLUGINSDIR}/libjavaplugin_oji.so
 	-${LN} -sf \
 	  ${JREDIR}/plugin/i386/ns600/libjavaplugin_oji.so \
 	  ${PLUGINSDIR}/libjavaplugin_oji.so
+
+cleanup-install:
+	${RM} -fr ${LOCAL_PREFIX}/share/idl
+	${RM} -fr ${LOCAL_PREFIX}/include
+
+cons-plist:
 	-${RM} -f ${PLIST}
 	${ECHO_CMD} bin/phoenix >>${PLIST}
 	${ECHO_CMD} bin/phoenix-config >>${PLIST}
 	cd ${PREFIX}; \
 	${FIND} ${LOCAL_SUBDIR} ! -type d | ${SORT} >>${PLIST}; \
 	${FIND} ${LOCAL_SUBDIR} -type d -empty | ${SORT} \
-	  | ${SED} -e "s:^:@exec /bin/mkdir -p %D/:" -e "s:$$: || true:" \
+	  | ${SED} -e "s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" \
 	  >> ${PLIST}; \
 	${FIND} ${LOCAL_SUBDIR} -type d -empty | ${SORT} -r \
-	  | ${SED} -e "s:^:@unexec /bin/rmdir %D/:" -e "s:$$: || true:" \
+	  | ${SED} -e "s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" \
 	  >> ${PLIST}; \
 	${FIND} ${LOCAL_SUBDIR} -type d ! -empty | ${SORT} -r \
 		| ${SED} -e "s:^:@dirrm :" >> ${PLIST}
 
+.PHONY: link-bins link-java cleanup-install cons-plist
+
 .include <bsd.port.post.mk>
+
+generate-plist: link-bins link-java cleanup-install cons-plist
+
 #EOF
diff --git a/www/flock/distinfo b/www/flock/distinfo
index f61de58d19c1..43ac5ff5109b 100644
--- a/www/flock/distinfo
+++ b/www/flock/distinfo
@@ -1 +1 @@
-MD5 (phoenix-0.4.tar.bz2) = 4b697330d5fde906b1a6169b80b60102
+MD5 (phoenix-0.5.20021209.tar.bz2) = b80c142a1dd4d88a4255fcabe8c84608
diff --git a/www/flock/files/mkdistfile b/www/flock/files/mkdistfile
index b178f4830686..a49174ae7b5d 100644
--- a/www/flock/files/mkdistfile
+++ b/www/flock/files/mkdistfile
@@ -119,56 +119,53 @@ done
 test $# -eq 1 || usage 1
 
 REV=$1
-test ${REV#*.} = today && REV=${REV%.*}.$DATE
+test ${REV##*.} = today && REV=${REV%.*}.$DATE
 
+status "pruning tree..."
 exfile=$(tmpfile)
 cat >>$exfile <<'EOF'
-*/CVS
-*/CVS/*
-*/macbuild
-*/macbuild/*
-*/package
-*/package/*
-*/.cvsignore
-*/windows
-*/windows/*
-*/activex
-*/activex/*
-*/os2
-*/os2/*
-*/solaris
-*/solaris/*
-*/gc
-*/gc/*
-mozilla/apache
-mozilla/calendar
-mozilla/cck
-mozilla/chimera
-mozilla/ef
-mozilla/embed.mak
-mozilla/embed.mk
-mozilla/gconfig
-mozilla/gfx2
-mozilla/grendel
-mozilla/java
-mozilla/js2
-mozilla/mail
-mozilla/mailnews
-mozilla/mozilla
-mozilla/mozilla.kdevprj
-mozilla/mozilla.lsm
-mozilla/msgsdk
-mozilla/mstone
-mozilla/nglayout.mac
-mozilla/nunet
-mozilla/other-licenses
-mozilla/privacy
-mozilla/silentdl
-mozilla/timer
-mozilla/trex.mak
-mozilla/trex.mk
-mozilla/webtools
+^.*/CVS($|/)
+^.*/macbuild($|/)
+^.*/package($|/)
+^.*/.cvsignore($|/)
+^.*/windows($|/)
+^.*/activex($|/)
+^.*/os2($|/)
+^.*/solaris($|/)
+^.*/gc($|/)
+^mozilla/apache($|/)
+^mozilla/calendar($|/)
+^mozilla/cck($|/)
+^mozilla/chimera($|/)
+^mozilla/ef($|/)
+^mozilla/embed.mak($|/)
+^mozilla/embed.mk($|/)
+^mozilla/gconfig($|/)
+^mozilla/gfx2($|/)
+^mozilla/grendel($|/)
+^mozilla/java($|/)
+^mozilla/js2($|/)
+^mozilla/mail($|/)
+^mozilla/mailnews($|/)
+^mozilla/mozilla($|/)
+^mozilla/mozilla.kdevprj($|/)
+^mozilla/mozilla.lsm($|/)
+^mozilla/msgsdk($|/)
+^mozilla/mstone($|/)
+^mozilla/nglayout.mac($|/)
+^mozilla/nunet($|/)
+^mozilla/other-licenses($|/)
+^mozilla/privacy($|/)
+^mozilla/silentdl($|/)
+^mozilla/timer($|/)
+^mozilla/trex.mak($|/)
+^mozilla/trex.mk($|/)
+^mozilla/webtools($|/)
 EOF
-tar -cjp -X $exfile -f phoenix-$REV.tar.bz2 mozilla
+test -d mozilla || die "No mozilla dir here."
+find mozilla 2>/dev/null | egrep -f $exfile | xargs rm -fr
 rm -f $exfile
+status "making phoenix-$REV.tar.bz2 ..."
+tar -cjpf phoenix-$REV.tar.bz2 mozilla
+status "done."
 #EOF
diff --git a/www/flock/files/mozconfig.in b/www/flock/files/mozconfig.in
index 88823ea75c24..c6beb3bb3703 100644
--- a/www/flock/files/mozconfig.in
+++ b/www/flock/files/mozconfig.in
@@ -36,17 +36,17 @@ ac_add_options --with-system-mng=@LOCALBASE@
 # enable features
 ac_add_options --with-pthreads
 ac_add_options --enable-xft
-ac_add_options --enable-xinerama
 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
+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-dtd-debug
-ac_add_options --disable-auto-deps
 ac_add_options --disable-pedantic
-ac_add_options --disable-jsd
-ac_add_options --disable-bidi
+ac_add_options --disable-xinerama
 ######################################################################
diff --git a/www/flock/pkg-message b/www/flock/pkg-message
index 83bdcb7742b5..68f8cf2be39f 100644
--- a/www/flock/pkg-message
+++ b/www/flock/pkg-message
@@ -1,4 +1,27 @@
 ======================================================================
+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.
+
+-- AlanE <phoenix@freebsd.org>
+
 0.4_9:
 Install link to java plugin.
 Build plist after install using find/sed.