7 files changed, 43 insertions, 86 deletions

diff --git a/net-p2p/i2p/Makefile b/net-p2p/i2p/Makefile
index 6ff86797e43f..fe8735f43c05 100644
--- a/net-p2p/i2p/Makefile
+++ b/net-p2p/i2p/Makefile
@@ -6,20 +6,19 @@
 #
 
 PORTNAME=	i2p
-PORTVERSION=	0.6.1.30
+PORTVERSION=	0.7.2
 CATEGORIES=	net-p2p java security
-MASTER_SITES=	http://dev.i2p.net/i2p/:i2p \
-		${MASTER_SITE_SOURCEFORGE:S/$/:jetty/}
-MASTER_SITE_SUBDIR=	jetty/:jetty
+MASTER_SITES=	http://mirror.i2p2.de/:i2p \
+		${MASTER_SITE_GOOGLE_CODE}:i2p \
+		SF/jetty:jetty
 DISTFILES=	\
-		${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:i2p \
+		i2psource_${PORTVERSION}${EXTRACT_SUFX}:i2p \
 		${JETTY_DISTFILE}:jetty
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
+EXTRACT_ONLY=	i2psource_${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	lioux@FreeBSD.org
-COMMENT=	An anonymous network
+COMMENT=	An anonymizing network
 
-EXTRACT_DEPENDS=	${LOCALBASE}/bin/ant:${PORTSDIR}/devel/apache-ant
 BUILD_DEPENDS=	${LOCALBASE}/lib/libgmp.a:${PORTSDIR}/math/libgmp4
 RUN_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
@@ -28,7 +27,7 @@ USE_RC_SUBR=	i2p.sh
 
 JAVA_BUILD=	jdk
 USE_JAVA=	yes
-JAVA_VERSION=	1.4+
+JAVA_VERSION=	1.5+
 JAVA_OS=	native
 USE_ANT=	yes
 
@@ -41,32 +40,9 @@ 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 \
-		serialized-form.html \
-		stylesheet.css
-DOC_DIRS=	\
-		freenet/ \
-		index-files/ \
-		net/ \
-		org/ \
-		resources/
 
 .ifndef(NOPORTDOCS)
-PORTDOCS=	${DOC_FILES} \
-		${DOC_DIRS}
+PORTDOCS=	*
 .endif
 
 PLIST_DIRS=	\
@@ -81,7 +57,6 @@ 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} \
@@ -106,16 +81,11 @@ do-install:
 # 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
+	@${INSTALL_DATA} ${WRKSRC}/readme*.html ${DOCSDIR}
 # 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}/{}" \;
+		${FIND} * -type d -exec ${MKDIR} "${DOCSDIR}/{}" \; && \
+		${FIND} * -not -type d -exec ${INSTALL_DATA} "{}" "${DOCSDIR}/{}" \;
 .endif
 
 .include <bsd.port.mk>
diff --git a/net-p2p/i2p/distinfo b/net-p2p/i2p/distinfo
index 22b495460548..a04afdef4de1 100644
--- a/net-p2p/i2p/distinfo
+++ b/net-p2p/i2p/distinfo
@@ -1,6 +1,6 @@
-MD5 (i2p-0.6.1.30.tar.bz2) = 7d44eea505527e0705793481bdd42ce7
-SHA256 (i2p-0.6.1.30.tar.bz2) = 1a017d263649e56c7b59126a81e29f1bcc4f284ad9c93a1d644112f14280b635
-SIZE (i2p-0.6.1.30.tar.bz2) = 9564784
+MD5 (i2psource_0.7.2.tar.bz2) = eb47ad58b8b80d34649a8715ec6b703d
+SHA256 (i2psource_0.7.2.tar.bz2) = 49f68c66167fbf3658156efbe946e965bd9471a71e76dfdd5f97a5c1b1470146
+SIZE (i2psource_0.7.2.tar.bz2) = 8339856
 MD5 (jetty-5.1.12.zip) = a61adc832be6baf2678935506743cfc3
 SHA256 (jetty-5.1.12.zip) = a165222106a3f10a827ecbc0bab2e4130daf22cafe4a101074dbd3fca4d2de12
 SIZE (jetty-5.1.12.zip) = 20802634
diff --git a/net-p2p/i2p/files/patch-apps__jetty__build.xml b/net-p2p/i2p/files/patch-apps__jetty__build.xml
deleted file mode 100644
index 575047a96e6b..000000000000
--- a/net-p2p/i2p/files/patch-apps__jetty__build.xml
+++ /dev/null
@@ -1,11 +0,0 @@
---- apps/jetty/build.xml.orig	Fri Apr 21 15:31:49 2006
-+++ apps/jetty/build.xml	Fri Apr 21 15:32:09 2006
-@@ -37,7 +37,7 @@
- 	<copy file="jetty-5.1.6/ext/commons-logging-api.jar" tofile="jettylib/commons-logging.jar" />
-         <delete dir="jetty-5.1.6" />
-     </target>
--    <target name="build" depends="fetchJettylib" />
-+    <target name="build" />
-     <target name="builddep" />
-     <target name="compile" />
-     <target name="jar" />
diff --git a/net-p2p/i2p/files/patch-build.xml b/net-p2p/i2p/files/patch-build.xml
deleted file mode 100644
index d761e63d11e4..000000000000
--- a/net-p2p/i2p/files/patch-build.xml
+++ /dev/null
@@ -1,10 +0,0 @@
---- build.xml.orig	Mon Feb 20 06:27:46 2006
-+++ build.xml	Fri Apr 21 15:02:11 2006
-@@ -41,7 +41,6 @@
-         <copy file="router/java/build/router.jar" todir="build/" />
-     </target>
-     <target name="buildWEB">
--        <ant dir="apps/jetty" target="fetchJettylib" />
-         <ant dir="apps/routerconsole/java" target="build" />
-         <copy file="apps/routerconsole/java/build/routerconsole.jar" todir="build/" />
-         <copy file="apps/routerconsole/java/build/routerconsole.war" todir="build/" />
diff --git a/net-p2p/i2p/files/patch-installer::resources::clients.config b/net-p2p/i2p/files/patch-installer::resources::clients.config
deleted file mode 100644
index dfabaa784b73..000000000000
--- a/net-p2p/i2p/files/patch-installer::resources::clients.config
+++ /dev/null
@@ -1,10 +0,0 @@
---- installer/resources/clients.config.orig	Mon Jan 10 18:50:30 2005
-+++ installer/resources/clients.config	Mon Jan 10 18:50:35 2005
-@@ -21,7 +21,3 @@
- clientApp.3.delay=30
- 
- # load a browser pointing at the web console whenever we start up
--clientApp.4.main=net.i2p.apps.systray.UrlLauncher
--clientApp.4.name=consoleBrowser
--clientApp.4.args=http://localhost:7657/
--clientApp.4.delay=5
diff --git a/net-p2p/i2p/files/patch-installer__resources__clients.config b/net-p2p/i2p/files/patch-installer__resources__clients.config
new file mode 100644
index 000000000000..0cec2b3c6e2f
--- /dev/null
+++ b/net-p2p/i2p/files/patch-installer__resources__clients.config
@@ -0,0 +1,11 @@
+--- installer/resources/clients.config.orig	2009-04-19 23:29:57.000000000 -0300
++++ installer/resources/clients.config	2009-04-19 23:30:23.000000000 -0300
+@@ -29,7 +29,7 @@
+ clientApp.4.name=consoleBrowser
+ clientApp.4.args=http://127.0.0.1:7657/index.jsp
+ clientApp.4.delay=5
+-clientApp.4.startOnLoad=true
++clientApp.4.startOnLoad=false
+ 
+ # BOB bridge
+ clientApp.5.args=
diff --git a/net-p2p/i2p/pkg-descr b/net-p2p/i2p/pkg-descr
index eb49f8daf5ec..6acf917dc404 100644
--- a/net-p2p/i2p/pkg-descr
+++ b/net-p2p/i2p/pkg-descr
@@ -1,14 +1,21 @@
 [ excerpt from developer's web site ]
 
-I2P is an anonymous network, exposing a simple layer that applications
-can use to anonymously and securely send messages to each other.
-The network itself is strictly message based (ala IP), but there
-is a library available to allow reliable streaming communication
-on top of it (ala TCP). All communication is end to end encrypted
-(in total there are four layers of encryption used when sending a
-message), and even the end points ("destinations") are cryptographic
-identifiers (essentially a pair of public keys).
-
-WWW: http://www.i2p.net/
+I2P is an anonymizing network, offering a simple layer that
+identity-sensitive applications can use to securely communicate.
+All data is wrapped with several layers of encryption, and the
+network is both distributed and dynamic, with no trusted parties.
+
+Many applications are available that interface with I2P, including
+mail, peer-peer, IRC chat, and others.
+
+Anonymity is not a boolean - we are not trying to make something
+"perfectly anonymous", but instead are working at making attacks
+more and more expensive to mount. I2P alone is what could be called
+a "low latency mix network", and there are limits to the anonymity
+offered by such a system, but the applications on top of I2P, such
+as Syndie, I2P mail, and I2PSnark extend it to offer both additional
+functionality and protection.
+
+WWW: http://www.i2p2.de/
 
 -- lioux@FreeBSD.org