3 files changed, 24 insertions, 5 deletions

diff --git a/www/jetty/Makefile b/www/jetty/Makefile
index 00e768f0d226..8183ed6523ee 100644
--- a/www/jetty/Makefile
+++ b/www/jetty/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	jetty
-PORTVERSION=	2.4.6
+PORTVERSION=	2.4.9
 CATEGORIES=	www java
 MASTER_SITES=	http://download.sourceforge.net/jetty/ \
 		ftp://jetty.mortbay.com/pub/
 DISTNAME=	Jetty-${PORTVERSION}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	stephane.legrand@bigfoot.com
 
@@ -20,6 +21,10 @@ RUN_DEPENDS=	${JAVAVM}:${PORTSDIR}/java/javavmwrapper \
 JAVAVM?=	${LOCALBASE}/bin/javavm
 NO_BUILD=	yes
 
+post-extract:
+	find ${WRKSRC} -name CVS | xargs ${RM} -rf
+	find ${WRKSRC} -name .cvsignore | xargs ${RM} -rf
+
 do-install:
 	@${MKDIR} ${PREFIX}/share/java/${PORTNAME}
 	@(cd ${WRKSRC} && ${TAR} -c -f - [^src]* ) \
diff --git a/www/jetty/distinfo b/www/jetty/distinfo
index 454927666076..1f88f500b561 100644
--- a/www/jetty/distinfo
+++ b/www/jetty/distinfo
@@ -1 +1 @@
-MD5 (Jetty-2.4.6.tar.gz) = 775fa472d46ef56ce87af97701b59c9a
+MD5 (Jetty-2.4.9.tgz) = 1f6cc0add3463ee131497cd824f816eb
diff --git a/www/jetty/pkg-plist b/www/jetty/pkg-plist
index c210d45be8b6..afa64bae359d 100644
--- a/www/jetty/pkg-plist
+++ b/www/jetty/pkg-plist
@@ -43,6 +43,7 @@ share/java/jetty/README.txt
 share/java/jetty/TODO.txt
 share/java/jetty/VERSION.txt
 share/java/jetty/bin/generateJavaDoc
+share/java/jetty/build-unix.mak
 share/java/jetty/build-win32.mak
 share/java/jetty/doc/JettyConfig.html
 share/java/jetty/doc/JsseSSL.html
@@ -81,6 +82,7 @@ share/java/jetty/javadoc/com/mortbay/Base/FileLogSink.html
 share/java/jetty/javadoc/com/mortbay/Base/Frame.html
 share/java/jetty/javadoc/com/mortbay/Base/Log.html
 share/java/jetty/javadoc/com/mortbay/Base/LogSink.html
+share/java/jetty/javadoc/com/mortbay/Base/LogWriter.html
 share/java/jetty/javadoc/com/mortbay/Base/RolloverFileLogSink.html
 share/java/jetty/javadoc/com/mortbay/Base/Test.html
 share/java/jetty/javadoc/com/mortbay/Base/TestHarness.html
@@ -246,6 +248,7 @@ share/java/jetty/javadoc/com/mortbay/Servlets/PropertyTreeEditor.EditorDispatche
 share/java/jetty/javadoc/com/mortbay/Servlets/PropertyTreeEditor.PruneArgs.html
 share/java/jetty/javadoc/com/mortbay/Servlets/PropertyTreeEditor.html
 share/java/jetty/javadoc/com/mortbay/Servlets/ServletDispatch.html
+share/java/jetty/javadoc/com/mortbay/Servlets/ServletDispatchErrorHandler.html
 share/java/jetty/javadoc/com/mortbay/Servlets/ServletDispatchHandler.html
 share/java/jetty/javadoc/com/mortbay/Servlets/ServletNode.html
 share/java/jetty/javadoc/com/mortbay/Servlets/SessionDump.html
@@ -253,15 +256,17 @@ share/java/jetty/javadoc/com/mortbay/Servlets/package-frame.html
 share/java/jetty/javadoc/com/mortbay/Servlets/package-summary.html
 share/java/jetty/javadoc/com/mortbay/Servlets/package-tree.html
 share/java/jetty/javadoc/com/mortbay/Util/ArrayConverter.html
+share/java/jetty/javadoc/com/mortbay/Util/ArrayConverter.ArrayConvertFail.html
 share/java/jetty/javadoc/com/mortbay/Util/BlockingQueue.html
 share/java/jetty/javadoc/com/mortbay/Util/Converter.html
+share/java/jetty/javadoc/com/mortbay/Util/ContainerIteratorTransformer.ContainerTransformFail.html
+share/java/jetty/javadoc/com/mortbay/Util/ContainerIteratorTransformer.html
+share/java/jetty/javadoc/com/mortbay/Util/ConvertFail.html
+share/java/jetty/javadoc/com/mortbay/Util/ConverterBase.html
 share/java/jetty/javadoc/com/mortbay/Util/ConverterSet.PrimitiveConverter.html
 share/java/jetty/javadoc/com/mortbay/Util/ConverterSet.html
 share/java/jetty/javadoc/com/mortbay/Util/DataClass.html
 share/java/jetty/javadoc/com/mortbay/Util/DictionaryConverter.html
-share/java/jetty/javadoc/com/mortbay/Util/DictionaryConverterTest.TestClass1.html
-share/java/jetty/javadoc/com/mortbay/Util/DictionaryConverterTest.TestClass2.html
-share/java/jetty/javadoc/com/mortbay/Util/DictionaryConverterTest.html
 share/java/jetty/javadoc/com/mortbay/Util/DumpFilterOutputStream.html
 share/java/jetty/javadoc/com/mortbay/Util/IO.html
 share/java/jetty/javadoc/com/mortbay/Util/InetAddrPort.html
@@ -269,6 +274,15 @@ share/java/jetty/javadoc/com/mortbay/Util/InetGateway.html
 share/java/jetty/javadoc/com/mortbay/Util/KeyPairTool.html
 share/java/jetty/javadoc/com/mortbay/Util/LineInput.html
 share/java/jetty/javadoc/com/mortbay/Util/Observed.html
+share/java/jetty/javadoc/com/mortbay/Util/ObjectConverter.ObjectConvertFail.html
+share/java/jetty/javadoc/com/mortbay/Util/ObjectConverter.html
+share/java/jetty/javadoc/com/mortbay/Util/ObjectConverterTest.A.html
+share/java/jetty/javadoc/com/mortbay/Util/ObjectConverterTest.B.html
+share/java/jetty/javadoc/com/mortbay/Util/ObjectConverterTest.TestClass1.html
+share/java/jetty/javadoc/com/mortbay/Util/ObjectConverterTest.TestClass2.html
+share/java/jetty/javadoc/com/mortbay/Util/ObjectConverterTest.html
+share/java/jetty/javadoc/com/mortbay/Util/Password.html
+share/java/jetty/javadoc/com/mortbay/Util/PropertyTreeConverter.html
 share/java/jetty/javadoc/com/mortbay/Util/PropertyEnumeration.html
 share/java/jetty/javadoc/com/mortbay/Util/PropertyTree.html
 share/java/jetty/javadoc/com/mortbay/Util/PropertyTreeTest.html