Index: head/net-p2p/i2p/Makefile
===================================================================
--- head/net-p2p/i2p/Makefile	(revision 190284)
+++ head/net-p2p/i2p/Makefile	(revision 190285)
@@ -1,128 +1,120 @@
 # New ports collection makefile for:	i2p
 # Date created:		Sun Jan  9 05:05:02 UTC 2005
 # Whom:                 Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	i2p
-PORTVERSION=	0.6.1.27
+PORTVERSION=	0.6.1.28
 CATEGORIES=	net-p2p java security
-MASTER_SITES=	http://dev.i2p.net/i2p/
+MASTER_SITES=	http://dev.i2p.net/i2p/:i2p \
+		${MASTER_SITE_SOURCEFORGE:S/$/:jetty/}
+MASTER_SITE_SUBDIR=	jetty/:jetty
+DISTFILES=	\
+		${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
+		${JETTY_DISTFILE}:jetty
+EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	An anonymous network
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libgmp.a:${PORTSDIR}/math/libgmp4 \
-		${LOCALBASE}/sbin/jettyctl:${PORTSDIR}/www/jetty
+BUILD_DEPENDS=	${LOCALBASE}/lib/libgmp.a:${PORTSDIR}/math/libgmp4
 RUN_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
-BROKEN=		Does not build
-
 USE_BZIP2=	yes
 USE_RC_SUBR=	i2p.sh
 
 JAVA_BUILD=	jdk
 USE_JAVA=	yes
 JAVA_VERSION=	1.4+
 JAVA_OS=	native
 USE_ANT=	yes
 
 ALL_TARGET=	\
 		updater \
 		tarball
 
 .ifndef(NOPORTDOCS)
 ALL_TARGET+=	javadoc
 .endif
 
 JAVADOC_WRKSRC=	${WRKSRC}/build/javadoc
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION:S/./_/g}
 
 DOC_FILES=	\
 		readme.html \
 		allclasses-frame.html \
 		allclasses-noframe.html \
 		constant-values.html \
 		deprecated-list.html \
 		help-doc.html \
 		index.html \
 		overview-frame.html \
 		overview-summary.html \
 		overview-tree.html \
 		package-list \
-		packages.html \
 		serialized-form.html \
 		stylesheet.css
 DOC_DIRS=	\
 		freenet/ \
 		index-files/ \
 		net/ \
 		org/ \
 		resources/
 
 .ifndef(NOPORTDOCS)
 PORTDOCS=	${DOC_FILES} \
 		${DOC_DIRS}
 .endif
 
 PLIST_DIRS=	\
 		%%DATADIR%%
 PLIST_FILES=	\
 		sbin/i2prouter \
 		%%DATADIR%%/i2p.tar.bz2 \
 		%%DATADIR%%/i2pupdate.zip
 
-JETTY_JAR_FILES=	\
-		ext/ant.jar \
-		ext/commons-el.jar \
-		ext/commons-logging.jar \
-		ext/jasper-compiler.jar \
-		ext/jasper-runtime.jar \
-		ext/xercesImpl.jar \
-		lib/javax.servlet.jar \
-		lib/org.mortbay.jetty.jar
+JETTY_DISTFILE=	jetty-5.1.12.zip
 
+post-extract:
+	@${MKDIR} ${WRKSRC}/apps/jetty/
+	@${CP} -f ${DISTDIR}/${JETTY_DISTFILE} ${WRKSRC}/apps/jetty/
+	@cd ${WRKSRC}/apps/jetty && ${ANT} doExtract
+
 post-patch:
 	@${SED} \
 		-e "s|%%DATADIR%%|${DATADIR}|" \
 		${FILESDIR}/wrapper.sh > ${WRKDIR}/wrapper.sh
 # postinstall.sh SHOULD only do post installation house keeping
 	@${REINPLACE_CMD} -E \
 		-e 's|./i2prouter[[:space:]]+start||' \
 		${WRKSRC}/installer/resources/postinstall.sh
-
-pre-build:
-# copy jetty jars instead of fetching/building
-	@${MKDIR} ${WRKSRC}/apps/jetty/jettylib
-.for file in ${JETTY_JAR_FILES}
-	@${CP} ${JAVASHAREDIR}/jetty/${file} ${WRKSRC}/apps/jetty/jettylib
-.endfor
 
 do-install:
 	@${MKDIR} ${DATADIR}
 # install
 	@${INSTALL_DATA} ${WRKSRC}/i2p.tar.bz2 \
 		${DATADIR}/
 # update
 	@${INSTALL_DATA} ${WRKSRC}/i2pupdate.zip \
 		${DATADIR}/
 # wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper.sh \
 		${PREFIX}/sbin/i2prouter
 # doc
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/readme.html ${DOCSDIR}
 .for doc in ${DOC_FILES}
 	@if [ -f ${JAVADOC_WRKSRC}/${doc} ]; then \
 		${INSTALL_DATA} ${JAVADOC_WRKSRC}/${doc} ${DOCSDIR} ; \
 	fi
 .endfor
 # line taken from textproc/xerces-j maintained by hq@FreeBSD.org
 	@cd ${JAVADOC_WRKSRC} && \
 		${FIND} ${DOC_DIRS} -type d -exec ${MKDIR} "${DOCSDIR}/{}" \; && \
 		${FIND} ${DOC_DIRS} -not -type d -exec ${INSTALL_DATA} "{}" "${DOCSDIR}/{}" \;
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/net-p2p/i2p/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.40
\ No newline at end of property
+1.41
\ No newline at end of property
Index: head/net-p2p/i2p/distinfo
===================================================================
--- head/net-p2p/i2p/distinfo	(revision 190284)
+++ head/net-p2p/i2p/distinfo	(revision 190285)
@@ -1,3 +1,6 @@
-MD5 (i2p-0.6.1.27.tar.bz2) = 70df6755f73d6b99df4cd5e0124b75a7
-SHA256 (i2p-0.6.1.27.tar.bz2) = 3ccee782c6d272dc20fe3036ef86611dde471d1d52cd7b3bfd8dcf6406f25d27
-SIZE (i2p-0.6.1.27.tar.bz2) = 9538121
+MD5 (i2p-0.6.1.28.tar.bz2) = 4184a059962a2a1566e8b1e78e6fc64e
+SHA256 (i2p-0.6.1.28.tar.bz2) = 681075e64030c5c4b16e99dc5e554d2df37f23d939ac3b9a5007b1487e65e637
+SIZE (i2p-0.6.1.28.tar.bz2) = 9538038
+MD5 (jetty-5.1.12.zip) = a61adc832be6baf2678935506743cfc3
+SHA256 (jetty-5.1.12.zip) = a165222106a3f10a827ecbc0bab2e4130daf22cafe4a101074dbd3fca4d2de12
+SIZE (jetty-5.1.12.zip) = 20802634

Property changes on: head/net-p2p/i2p/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.35
\ No newline at end of property
+1.36
\ No newline at end of property